Redoing same getenv removal as in c8823e7. Accidentally added them back in on the last commit.