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