I'm fine on having a workaround, but not if it's too invasive, which IMO right now it is.
So, I'm fine with only removing the biggest envars (which are much less likely to be important), like !6140 does
It's just only around 40 lines added, and it has no performance impact if the envars block is small, so I don't really see why not that instead.