Backed out changeset 06f41c22f3a6 (bug 1888460) for causing linux xpcshell failures...