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