I wonder if we should pass the client env var name here too....