Merge "Don't add or remove verifiers if aborting"