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