Merge "Re-introduce an old version of 600-verifier-fails."