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