From 39de1dcd998d370928c1a6e257bcf6cae18bb800 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Sun, 10 Apr 2016 17:54:11 -0500
Subject: [PATCH] Backed out changeset d7d0413af62b (bug 1199023) for test
 failures.

---
 testing/mochitest/harness.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mochitest/harness.xul b/testing/mochitest/harness.xul
index 3ad3d692f896..e0356abac7e5 100644
--- a/testing/mochitest/harness.xul
+++ b/testing/mochitest/harness.xul
@@ -84,7 +84,7 @@ function linkAndHookup(links) {
         </div>
         <div class="clear"></div>
         <div class="frameholder">
-          <iframe type="content" id="testframe" width="550" height="350"></iframe>
+          <iframe type="content" scrolling="no" id="testframe" width="550" height="350"></iframe>
         </div>
         <div class="clear"></div>
         <div class="toggle">