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