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