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