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