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