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