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