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