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