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