revert bad gpgv options patch