Backed out changeset 0569a8a2f83d (bug 958727) for causing performance regressions.