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