I think this is ready to be merged
This will create a new commit in order to revert the existing changes.
