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