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