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