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