diff --git a/index.html b/index.html
index d1f2444..1064de3 100644
--- a/index.html
+++ b/index.html
@@ -171,9 +171,10 @@ <h2>
         <code><a href=
         "http://www.w3.org/TR/dom/#notfounderror"><dfn>NotFoundError</dfn></a></code>,
         <code><a href=
-        "http://www.w3.org/TR/dom/#securityerror"><dfn>SecurityError</dfn></a></code>, and <a href=
-        "http://www.w3.org/TR/dom/#concept-event-constructor"><dfn>steps for constructing
-        events</dfn></a> are defined in [[!DOM]].
+        "http://www.w3.org/TR/dom/#securityerror"><dfn>SecurityError</dfn></a></code>,
+        <code><a href="http://www.w3.org/TR/dom/#networkerror"><dfn>NetworkError</dfn></a></code>,
+        and <a href="http://www.w3.org/TR/dom/#concept-event-constructor"><dfn>steps for
+        constructing events</dfn></a> are defined in [[!DOM]].
       </p>
       <p>
         <dfn>Service Worker</dfn>, <dfn>ServiceWorkerRegistration</dfn>,
@@ -441,9 +442,6 @@ <h2>
         <dt>
           Promise&lt;PushRegistration&gt; register ()
         </dt>
-        <dt>
-          Promise&lt;PushRegistration&gt; unregister ()
-        </dt>
         <dt>
           Promise&lt;PushRegistration&gt; getRegistration ()
         </dt>
@@ -505,31 +503,6 @@ <h2>
         has not yet been defined in a specification, this document currently links to the bug for
         defining it.
       </p>
-      <p>
-        The <code><dfn id=
-        "widl-PushRegistrationManager-unregister-Promise-PushRegistration">unregister</dfn></code>
-        method when invoked MUST run the following steps:
-      </p>
-      <ol>
-        <li>Let <var>promise</var> be a new <a><code>Promise</code></a>.
-        </li>
-        <li>Return <var>promise</var> and continue the following steps asynchronously.
-        </li>
-        <li>If the <a>webapp</a> is not registered, reject <var>promise</var> with a
-        <code><a>DOMException</a></code> whose name is "<code><a>NotFoundError</a></code>" and
-        terminate these steps.
-        </li>
-        <li>Make a request to the system to deactivate the <a>push registration</a> associated with
-        the <a>webapp</a>.
-        </li>
-        <li>If there is an error, reject <var>promise</var> with a <code><a>DOMException</a></code>
-        whose name is "<code><a>AbortError</a></code>" and terminate these steps.
-        </li>
-        <li>When the request has been completed, resolve <var>promise</var> with a
-        <a><code>PushRegistration</code></a> providing the details of the <a>push registration</a>
-        which has been unregistered.
-        </li>
-      </ol>
       <p>
         The <code><dfn id=
         "widl-PushRegistrationManager-getRegistration-Promise-PushRegistration">getRegistration</dfn></code>
@@ -644,6 +617,9 @@ <h2>
         <dt>
           readonly attribute DOMString registrationId
         </dt>
+        <dt>
+          Promise&lt;boolean&gt; unregister ()
+        </dt>
       </dl>
       <p>
         When getting the <code><dfn id="widl-PushRegistration-endpoint">endpoint</dfn></code>
@@ -662,6 +638,28 @@ <h2>
         <code>registrationId</code> and <code>endpoint</code> is expected to be unique and specific
         to a particular <a>webapp</a> instance running on a specific device.
       </p>
+      <p>
+        The <code><dfn id=
+        "widl-PushRegistration-unregister-Promise-boolean">unregister</dfn></code> method when
+        invoked MUST run the following steps:
+      </p>
+      <ol>
+        <li>Let <var>promise</var> be a new <a><code>Promise</code></a>.
+        </li>
+        <li>Return <var>promise</var> and continue the following steps asynchronously.
+        </li>
+        <li>If the <a>webapp</a> is not registered, resolve <var>promise</var> with
+        <code>false</code> and terminate these steps.
+        </li>
+        <li>Make a request to the system to deactivate the <a>push registration</a> associated with
+        the <a>webapp</a>.
+        </li>
+        <li>If it was not possible to access the <a>push server</a>, reject <var>promise</var> with
+        a "<code><a>NetworkError</a></code>" exception and terminate these steps.
+        </li>
+        <li>When the request has been completed, resolve <var>promise</var> with <code>true</code>.
+        </li>
+      </ol>
     </section>
     <section>
       <h2>