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