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