Back out b65289e2b06c (bug 853642) because of mochitest failures on a CLOSED TREE