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