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