This also moves env var control back into the local build, so we don't have to restart buildbot to change that.
