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