Questionable changes to help debug test_env_vars failure