This patch synchronizes changes from whatwg/fetch#1569 and resolves a related FIXME: "Refactor this to the new version of the spec introduced with whatwg/fetch@464326e.”