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