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