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