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