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