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