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