Use pushd and popd on WORKSPACE as well