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