merged
mentioned in commit 231dcb10
This will create a new commit in order to revert the existing changes.
