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