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