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