Editor's drafts for revert-467-dev/fix-457 branch of quicwg/multipath