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