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