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