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