Remove Redundant Environment Variable Usage Former-commit-id: d06d56661b182b54e2ccb17a7c015c0adc00dfc3