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