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