--- a/encrypted-media/encrypted-media.html	Tue Mar 25 14:39:42 2014 -0700
+++ b/encrypted-media/encrypted-media.html	Tue Mar 25 14:40:33 2014 -0700
@@ -931,15 +931,12 @@
 
     <ol>
       <li>
-<p>Follow the steps for the first matching condition from the following list:</p>
-        <dl class="switch">
-        <dt>If the media element's <code><a href="#dom-attrmediakeys">mediaKeys</a></code> attribute is not null:</dt>
-        <dd>Run the following steps:
-          <ol>
-            <li><p>Let <var title="true">cdm</var> be the <var title="true">cdm</var> loaded in the <a href="#dom-mediakeys-constructor"><code>MediaKeys</code> constructor</a>.</p></li>
-            <li>
+<p>If the media element's <code><a href="#dom-attrmediakeys">mediaKeys</a></code> attribute is not null, run the following steps:</p>
+        <ol>
+          <li><p>Let <var title="true">cdm</var> be the <var title="true">cdm</var> loaded in the <a href="#dom-mediakeys-constructor"><code>MediaKeys</code> constructor</a>.</p></li>
+          <li>
 <p>If <var title="true">cdm</var> has at least one <code><a href="#dom-mediakeysession">MediaKeySession</a></code> in the <code><a href="#dom-statepending">PENDING</a></code> or <code><a href="#dom-stateready">READY</a></code> state, run the following steps:</p>
-              <p class="non-normative">This check ensures the <var title="true">cdm</var> has finished loading and is a prequisite for a matching key being available.</p>
+            <p class="non-normative">This check ensures the <var title="true">cdm</var> has finished loading and is a prequisite for a matching key being available.</p>
             <ol>
               <li><p>Let <var title="true">block key ID</var> be the key ID of the current block <span class="non-normative">(as specified by the container)</span>.</p></li>
               <li>
@@ -981,10 +978,8 @@
                 </dl>
               </li>
             </ol>
-            </li>
-          </ol>
-        </dd>
-      </dl>
+          </li>
+        </ol>
       </li>
       <li>
         <p>Abort these steps and wait for a signal to resume playback.</p>

--- a/encrypted-media/encrypted-media.xml	Tue Mar 25 14:39:42 2014 -0700
+++ b/encrypted-media/encrypted-media.xml	Tue Mar 25 14:40:33 2014 -0700
@@ -893,14 +893,11 @@
     <p>The following steps are run when the <a href="#media-element">media element</a> encounters a block <span class="non-normative">(i.e. frame)</span> of encrypted <videoanchor name="media-data">media data</videoanchor> during the <resource-fetch-algorithm/>:</p>
 
     <ol>
-      <li><p>Follow the steps for the first matching condition from the following list:</p>
-        <dl class="switch">
-        <dt>If the media element's <coderef prefix="attr">mediaKeys</coderef> attribute is not null:</dt>
-        <dd>Run the following steps:
-          <ol>
-            <li><p>Let <var title="true">cdm</var> be the <var title="true">cdm</var> loaded in the <a href="#dom-mediakeys-constructor"><code>MediaKeys</code> constructor</a>.</p></li>
-            <li><p>If <var title="true">cdm</var> has at least one <coderef>MediaKeySession</coderef> in the <coderef prefix="state">PENDING</coderef> or <coderef prefix="state">READY</coderef> state, run the following steps:</p>
-              <p class="non-normative">This check ensures the <var title="true">cdm</var> has finished loading and is a prequisite for a matching key being available.</p>
+      <li><p>If the media element's <coderef prefix="attr">mediaKeys</coderef> attribute is not null, run the following steps:</p>
+        <ol>
+          <li><p>Let <var title="true">cdm</var> be the <var title="true">cdm</var> loaded in the <a href="#dom-mediakeys-constructor"><code>MediaKeys</code> constructor</a>.</p></li>
+          <li><p>If <var title="true">cdm</var> has at least one <coderef>MediaKeySession</coderef> in the <coderef prefix="state">PENDING</coderef> or <coderef prefix="state">READY</coderef> state, run the following steps:</p>
+            <p class="non-normative">This check ensures the <var title="true">cdm</var> has finished loading and is a prequisite for a matching key being available.</p>
             <ol>
               <li><p>Let <var title="true">block key ID</var> be the key ID of the current block <span class="non-normative">(as specified by the container)</span>.</p></li>
               <li><p>Use <var title="true">cdm</var> to decrypt the block by following the steps for the first matching condition from the following list:</p>
@@ -936,10 +933,8 @@
                 </dl>
               </li>
             </ol>
-            </li>
-          </ol>
-        </dd>
-      </dl>
+          </li>
+        </ol>
       </li>
       <li>
         <p>Abort these steps and wait for a signal to resume playback.</p>