Fix verification retries (bug 1012725)