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