Backed out changeset 665bcec8a2d4 (bug 1847716) for causing mochitest-plain failures...