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