Revert: stop setting PWD in environment, due to a couple of reported problems