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