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