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