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