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