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