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