Is this intentional? Seems odd to ditch the env var for two cases and leave it for one.