Switch back to foolproof no-ball test