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