more rebase fixes

source

@@ -83080,27 +83080,15 @@ interface <dfn>Location</dfn> { // but see also <a href="#the-location-interface
    <li><p>Let <var>settingsObject</var> be the <code>Document</code>'s
    <span>relevant settings object</span>.</p></li>
 
-   <li><p>Let <var>clientHintsSet</var> be the result of running <span
-   data-x="concept-retrieve-client-hints-set-accept-ch-lifetime-cache">retrieve the client-hints
+   <li><p>Let <var>clientHintsSet</var> be the result of running <span>retrieve the client-hints
    set</span> with <var>settingsObject</var>'s <span
    data-x="concept-settings-object-origin">origin</span>.</p></li>
 
-   <li><p>For each entry in <var>clientHintsSet</var>, <span data-x="set append">append</span>
-   it to the <code>Document</code>'s <span
-   data-x="concept-document-client-hints-set">client-hints set</span>.</p></li>
-
-   <li><p>Let <var>settingsObject</var> be the <code>Document</code>'s
-   <span>relevant settings object</span>.</p></li>
-
-    <li><p>Let <var>clientHintsSet</var> be the result of running <span>retrieve the client-hints
-   set</span> with <var>settingsObject</var>'s <span
-   data-x="concept-settings-object-origin">origin</span>.</p></li>
-
-    <li><p>For each <var>hint</var> in <var>clientHintsSet</var>, <span data-x="set
+   <li><p>For each <var>hint</var> in <var>clientHintsSet</var>, <span data-x="set
    append">append</span> <var>hint</var> to the <code>Document</code>'s <span
    data-x="concept-document-client-hints-set">client-hints set</span>.</p></li>
 
-    <li><p>Let <var>callerIsSecureContext</var> be the result of executing <span>Is environment
+   <li><p>Let <var>callerIsSecureContext</var> be the result of executing <span>Is environment
    settings object a secure context?</span> on <var>settingsObject</var>.</p></li>
 
     <li><p>If <var>response</var>'s `<code>Accept-CH</code>` header is present, and