replace pushd/popd since they aren't working