Back out 87e2bfbb427d (bug 874295) for mochitest-1 failures
CLOSED TREE