Backed out changeset ab4c12c6028b (bug 988155) for xpcshell failures.