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