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