Revert "Ensure working_dir gets removed"

This reverts commit 151363a4a1884d71a7aa5ff26da73b4db2b4be37.