Reverting pull request #372 Fix credentials are missing error