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