Simplify upmaster because of bad pushd/popd behavior