Backed out changeset 1f1f058843cc (bug 860625) for xpcshell failures.