Simplifying script a little, by avoiding pushd/popd. This seems to
fix running on jenkins.