and then passing them to MAKE_ENV instead of just setting them in the context of the latter. PR: 153625 Feature safe: yes