r6219: This change allows us to fall back to authenticating without