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