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