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