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