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