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