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