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