Reverted temp use of auth env vars