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