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