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