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