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