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