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