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