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