--- a/dom/promise/PromiseCallback.cpp
+++ b/dom/promise/PromiseCallback.cpp
@@ -198,33 +198,33 @@ WrapperPromiseCallback::Call(JSContext* 
   JS::Rooted<JS::Value> value(aCx, aValue);
   if (!JS_WrapValue(aCx, &value)) {
     NS_WARNING("Failed to wrap value into the right compartment.");
     return;
   }
 
   ErrorResult rv;
 
-  // PromiseReactionTask step 6
+  // If invoking callback threw an exception, run resolver's reject with the
+  // thrown exception as argument and the synchronous flag set.
   JS::Rooted<JS::Value> retValue(aCx);
   mCallback->Call(value, &retValue, rv, CallbackObject::eRethrowExceptions);
 
   rv.WouldReportJSException();
 
-  // PromiseReactionTask step 7
   if (rv.Failed() && rv.IsJSException()) {
     JS::Rooted<JS::Value> value(aCx);
     rv.StealJSException(aCx, &value);
 
     if (!JS_WrapValue(aCx, &value)) {
       NS_WARNING("Failed to wrap value into the right compartment.");
       return;
     }
 
-    mNextPromise->RejectInternal(aCx, value);
+    mNextPromise->RejectInternal(aCx, value, Promise::SyncTask);
     return;
   }
 
   // If the return value is the same as the promise itself, throw TypeError.
   if (retValue.isObject()) {
     JS::Rooted<JSObject*> valueObj(aCx, &retValue.toObject());
     Promise* returnedPromise;
     nsresult r = UNWRAP_OBJECT(Promise, valueObj, returnedPromise);
@@ -279,23 +279,24 @@ WrapperPromiseCallback::Call(JSContext* 
         return;
       }
 
       mNextPromise->RejectInternal(aCx, typeError, Promise::SyncTask);
       return;
     }
   }
 
-  // Otherwise, run resolver's resolve with value.
+  // Otherwise, run resolver's resolve with value and the synchronous flag
+  // set.
   if (!JS_WrapValue(aCx, &retValue)) {
     NS_WARNING("Failed to wrap value into the right compartment.");
     return;
   }
 
-  mNextPromise->ResolveInternal(aCx, retValue);
+  mNextPromise->ResolveInternal(aCx, retValue, Promise::SyncTask);
 }
 
 // NativePromiseCallback
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(NativePromiseCallback,
                                    PromiseCallback, mHandler)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(NativePromiseCallback)

--- a/dom/promise/tests/test_promise.html
+++ b/dom/promise/tests/test_promise.html
@@ -669,55 +669,16 @@ function promiseTestAsyncThenableResolut
     k--;
     if (k > 0) return Promise.resolve().then(next);
   }).then(function () {
     ok(true, "Resolution of a chain of thenables should not be synchronous.");
     runTest();
   });
 }
 
-// Bug 1062323
-function promiseWrapperAsyncResolution()
-{
-  var p = new Promise(function(resolve, reject){
-    resolve();
-  });
-
-  var results = [];
-  var q = p.then(function () {
-    results.push("1-1");
-  }).then(function () {
-    results.push("1-2");
-  }).then(function () {
-    results.push("1-3");
-  });
-
-  var r = p.then(function () {
-    results.push("2-1");
-  }).then(function () {
-    results.push("2-2");
-  }).then(function () {
-    results.push("2-3");
-  });
-
-  Promise.all([q, r]).then(function() {
-    var match = results[0] == "1-1" &&
-                results[1] == "2-1" &&
-                results[2] == "1-2" &&
-                results[3] == "2-2" &&
-                results[4] == "1-3" &&
-                results[5] == "2-3";
-    ok(match, "Chained promises should resolve asynchronously.");
-    runTest();
-  }, function() {
-    ok(false, "promiseWrapperAsyncResolution: One of the promises failed.");
-    runTest();
-  });
-}
-
 var tests = [ promiseResolve, promiseReject,
               promiseException, promiseGC, promiseAsync,
               promiseDoubleThen, promiseThenException,
               promiseThenCatchThen, promiseRejectThenCatchThen,
               promiseRejectThenCatchThen2,
               promiseRejectThenCatchExceptionThen,
               promiseThenCatchOrderingResolve,
               promiseThenCatchOrderingReject,
@@ -740,17 +701,16 @@ var tests = [ promiseResolve, promiseRej
               promiseWithThenReplaced,
               promiseStrictHandlers,
               promiseStrictExecutorThisArg,
               promiseResolveArray,
               promiseResolveThenable,
               promiseResolvePromise,
               promiseResolveThenableCleanStack,
               promiseTestAsyncThenableResolution,
-              promiseWrapperAsyncResolution,
             ];
 
 function runTest() {
   if (!tests.length) {
     SimpleTest.finish();
     return;
   }