Backed out changeset 878a9dd89f82 (bug 1042889) for xpcshell failures.