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