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