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