Backed out changeset 287aa2e3cab0 (bug 998809) for xpcshell and mochitest 2 test failures