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