If you'd prefer to do the new-upstream import yourself, you might want
to cherry-pick the first few commits from my MR first, in order to lose
the now-unnecessary +ds suffix.
Or, you can fetch my import from the upstream-experimental and
pristine-tar branches in my fork: