Backout 9080f6701733 (bug 852411) for hitting weird xpcshell test harness behavior in multiple local builds