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