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