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