Removed behaviour of always trying to authenticate.