Let's try it without the pushd/popd.