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