Fix up fetch_ci_tracking even more.