changed env to match current patchset