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