Stop overriding envvars nilly-willy

It's confusing. :(