Moved away from setting an env var