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