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