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