But should we let it pick the master env variable, or force the master to load from the client env var?