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