Move the variable change to the future, so v2 won't be as big of a change. It's nothing critical to fix, and envs can be deprecated without breaking binary compat.