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