Reverting a bad revert after a wrong pull