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