This method, and calls to it, are what I was referring to with regards to your removing EnvVars references.