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