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