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