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