3.5.4 release build fix

handle removed gEnv indirection