Use cd instead of pushd/popd