OOPS Revert "FIXforcwdthing"

This reverts commit 24ccfa9aa8eca62eb1f298fbed4c240a12d3f379.
OOPS Revert "Use non-deprecated method to get cwd"

This reverts commit 420e6d9c263ce6458db60e848e9aa70d1d077a34.