Backed out changeset e4bf227a6224 (bug 1801501) for causing mochitest plain failures...