Move this re-verify code elsewhere.