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