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