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