patch environment for #2126707