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