That being said, the patch now relies on changes made in
scratch/package-vc-fixes.  I can "backport" it onto master, or push it
in a few days when the issues related to that branch are resolved.