Backed out changeset f1d1f89e5bd5 (bug 407821) for xpcshell failures