Backed out changeset ecf04c6eb4dd (bug 1048579) for xpcshell failures.