Backed out changeset cabe6efe4de8 (bug 945363) for xpcshell failures.