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