remove use of env.run and env.cd because and allow them to be monkey-patched