backing out the region and form role changes based circumstances outlined in the PR comment thread

Author: cookiecrook

index.html

@@ -4281,8 +4281,9 @@ <h2>Definition of Roles</h2>
               possible. If the purpose of a form is to submit search criteria, authors SHOULD use the <rref>search</rref> role instead of the generic <code>form</code> role.
             </p>
             <p>
-              Authors SHOULD give each element with role <code>form</code> a label that describes the purpose of the form, using either <a href="#namecalculation">namefrom</a>: author or 
-              <a href="#namecalculation">namefrom</a>: heading.
+              Authors SHOULD give each element with role <code>form</code> a brief label that describes the purpose of the form. Authors SHOULD reference a visible label with
+              <pref>aria-labelledby</pref> if a visible label is present. Authors SHOULD include the label inside of a heading whenever possible. The heading MAY be an instance of the standard host
+              language heading element or an instance of an element with role <rref>heading</rref>.
             </p>
             <p>
               If an author uses a script to submit a form based on a user action that would otherwise not trigger an <code>onsubmit</code> event (for example, a form submission triggered by the user
@@ -4346,12 +4347,7 @@ <h2>Definition of Roles</h2>
               </tr>
               <tr>
                 <th class="role-namefrom-head" scope="row">Name From:</th>
-                <td class="role-namefrom">
-                  <ul>
-                    <li>author</li>
-                    <li>heading</li>
-                  </ul>
-                </td>
+                <td class="role-namefrom">author</td>
               </tr>
               <tr>
                 <th class="role-namerequired-head" scope="row">Accessible Name Required:</th>
@@ -8015,7 +8011,9 @@ <h5>Presentational Role Inheritance</h5>
               <a href="#landmark_roles">landmark roles</a>, such as <rref>main</rref>, <rref>complementary</rref>, or <rref>navigation</rref>.
             </p>
             <p>
-              Authors MUST give each element with role region a label that describes the purpose of the content in the region, using either <a href="#namecalculation">namefrom</a>: author or <a href="#namecalculation">namefrom</a>: heading.
+              Authors MUST give each element with role region a brief label that describes the purpose of the content in the region. Authors SHOULD reference a visible label with
+              <pref>aria-labelledby</pref> if a visible label is present. Authors SHOULD include the label inside of a heading whenever possible. The heading MAY be an instance of the standard host
+              language heading element or an instance of an element with role <rref>heading</rref>.
             </p>
             <p>
               <a>Assistive technologies</a> SHOULD enable users to quickly navigate to elements with role <code>region</code>. [=User agents=] SHOULD treat elements with role <code>region</code> and
@@ -8075,12 +8073,7 @@ <h5>Presentational Role Inheritance</h5>
               </tr>
               <tr>
                 <th class="role-namefrom-head" scope="row">Name From:</th>
-                <td class="role-namefrom">
-                  <ul>
-                    <li>author</li>
-                    <li>heading</li>
-                  </ul>
-                </td>
+                <td class="role-namefrom">author</td>
               </tr>
               <tr>
                 <th class="role-namerequired-head" scope="row">Accessible Name Required:</th>