Merge "Only use environment variables on the host."