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