Backed out changeset f327334172ab. Bad bug number in comment.  926116(good) vs 926166(bad)