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