diff --git a/src/lib/dom-api.html b/src/lib/dom-api.html
index ecf355eef2..b7eb4a33d4 100644
--- a/src/lib/dom-api.html
+++ b/src/lib/dom-api.html
@@ -768,9 +768,6 @@
 
     // flush and debounce exposed as statics on Polymer.dom
     var flush = Polymer.dom.flush = function() {
-      // first make any pending CE mutations that might trigger debouncer
-      // additions go...
-      flush.flushPolyfills();
       // flush debouncers
       for (var i=0; i < flush._debouncers.length; i++) {
         flush._debouncers[i].complete();
@@ -787,12 +784,15 @@
         flush.guard++;
         flush();
       } else {
+        if (flush.guard >= flush.MAX) {
+          console.warn('Polymer.dom.flush aborted. Flush may not be complete.')
+        }
         flush.guard = 0;
       }
     };
 
     flush.guard = 0;
-    flush.MAX = 10;
+    flush.MAX = 100;
     flush._needsTakeRecords = !Polymer.Settings.useNativeCustomElements;
     // TODO(sorvell): There is currently not a good way 
     // to process all custom elements mutations under SD polyfill because