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