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