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