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