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