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