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