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