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