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