If it fixes things now, merge it, refactoring can be done later.

Overall, is about not getting to fake the env too many times if same env can be re-used -- again, I need to look at other parts, it actually may not be the case for this situation.

—
Reply to this email directly or view it on GitHub.