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