diff --git a/amendments.json b/amendments.json
index 790861e69..12ba4a3c0 100644
--- a/amendments.json
+++ b/amendments.json
@@ -142,20 +142,12 @@
   ],
   "remote-rid-reneg": [
     {
-      "description": "Narrow rejection of simulcast to remotely initiated offers",
-      "pr": 2757,
+      "description": "Don't fail sRD(offer) over rid mismatch, just answer with unicast.",
+      "pr": 2794,
       "difftype": "modify",
       "type": "correction",
       "status": "candidate",
-      "id": 13
-    },
-    {
-      "description": "Allow remote offer rid pruning of encodings through the client answer.",
-      "pr": 2758,
-      "difftype": "modify",
-      "type": "correction",
-      "status": "candidate",
-      "id": 22
+      "id": 23
     }
   ],
   "direction-set": [
@@ -316,5 +308,15 @@
       "status": "candidate",
       "id": 22
     }
+  ],
+  "answer-missing-encodings": [
+    {
+      "description": "Don't fail sRD(offer) over rid mismatch, just answer with unicast.",
+      "pr": 2794,
+      "difftype": "modify",
+      "type": "correction",
+      "status": "candidate",
+      "id": 23
+    }
   ]
 }
diff --git a/base-rec.html b/base-rec.html
index 804d8527e..8b1dceafb 100644
--- a/base-rec.html
+++ b/base-rec.html
@@ -2421,8 +2421,8 @@ <h5 id="x4-4-1-5-set-the-session-description"><bdi class="secno">4.4.1.5 </bdi>
                       it were in stable state.
                     </p>
                   </li>
-                  <li class="needs-tests">
-                    <p id="remote-rid-reneg">
+                  <li class="needs-tests" id="remote-rid-reneg">
+                    <p>
                       If applying <var>description</var> leads to modifying a
                       transceiver <var>transceiver</var>, and
                       <var>transceiver</var>.<a href="#dfn-sender" class="internalDFN" data-link-type="dfn" id="ref-for-dfn-sender-1">[[Sender]]</a>.<a href="#dfn-sendencodings" class="internalDFN" data-link-type="dfn" id="ref-for-dfn-sendencodings-1">[[SendEncodings]]</a>
@@ -3061,7 +3061,7 @@ <h5 id="x4-4-1-5-set-the-session-description"><bdi class="secno">4.4.1.5 </bdi>
                                 </p>
                                 <ol>
                                   <li class="needs-tests">
-                                    <p>
+                                    <p id="answer-missing-encodings">
                                       If <var>description</var> indicates that
                                       simulcast is not supported or desired,
                                       then remove all dictionaries in
diff --git a/webrtc.html b/webrtc.html
index 4c2fd7417..935591037 100644
--- a/webrtc.html
+++ b/webrtc.html
@@ -1755,38 +1755,10 @@ <h4>
                       it were in stable state.
                     </p>
                   </li>
-                  <li>
-                    <p id="remote-rid-reneg">
-                      If <var>remote</var> is <code>true</code>, and
-                      <var>description</var> is of type
-                      {{RTCSdpType/"offer"}}, then for each
-                      [= media description =] requesting to receive simulcast
-                      that already has an existing {{RTCRtpTransceiver}} object,
-                      <var>transceiver</var>, associated with it, as described in
-                      <span data-jsep="applying-a-remote-desc">[[!RFC8829]]</span>,
-                      if none of the encodings in
-                      <var>transceiver</var>.{{RTCRtpTransceiver/[[Sender]]}}.{{RTCRtpSender/[[SendEncodings]]}}
-                      [=map/contain=] a {{RTCRtpCodingParameters/rid}} member
-                      whose value matches any of the rids in the simulcast
-                      attribute, then [= description fails | fail =] the
-                      process of applying <var>description</var>.
-                      <div class="note">
-                        A change in rids values is tolerated in remote offers to
-                        receive simulcast as long as at least one rid matches a
-                        rid in the encodings that were previously negotiated, or
-                        the offer is to no longer receive simulcast.
-                        Mismatched or out-of-order rids result in layer removal,
-                        and layer expansion is prevented in user agent answers.
-                        This specification does not allow remotely initiated RID
-                        renegotiation.
-                      </div>
-                    </p>
-                  </li>
+                  <li id="remote-rid-reneg" class="diff-rm"><!-- kept for candidate amendment management --></li>
                   <li>
                     <p>
-                      If the <dfn data-lt="description fails"
-                      id="fail-description">process to apply
-                      <var>description</var> fails</dfn> for
+                      If the process to apply <var>description</var> fails for
                       any reason, then the user agent MUST queue a task that
                       runs the following steps:
                     </p>
@@ -2465,9 +2437,11 @@ <h4>
                                 </p>
                                 <ol>
                                   <li>
-                                    <p>
+                                    <p id="answer-missing-encodings">
                                       If <var>description</var> indicates that
-                                      simulcast is not supported or desired,
+                                      simulcast is not supported or desired, or
+                                      <var>description</var> is missing all of
+                                      the previously negotiated layers,
                                       then remove all dictionaries in
                                       <var>transceiver</var>.{{RTCRtpTransceiver/[[Sender]]}}.{{RTCRtpSender/[[SendEncodings]]}}
                                       except the first one and abort these sub
@@ -2477,7 +2451,7 @@ <h4>
                                   <li>
                                     <p id="answer-rejects-encodings">
                                       If <var>description</var> is missing any of
-                                      the previously negototiated layers, then
+                                      the previously negotiated layers, then
                                       remove the dictionaries that correspond to
                                       the missing layers from
                                       <var>transceiver</var>.{{RTCRtpTransceiver/[[Sender]]}}.{{RTCRtpSender/[[SendEncodings]]}}.