Back out 86a9b2253199 (bug 943681) because of mochitest timeouts on OS X on a CLOSED TREE