Why hiding the real cause of bug 2062 by a hack, as you already did in r27107 for bug 2151?
IMO, you should do the same thing and search the root problem or leave the effect visible, so it won't be forgotten.
I know where is the root of the problem, and r27174 is a real solution, not simple hiding. I called it 'hackish' considering a poor quality of the code and of the patch itself. The code (probably written by different people, at different times) should be rewritten more cleanly, i think (do not forgot).
About r27107. It does not hide anything, as the bug is obvious. IMO, it was better to turn problematic piece of code off (until a good solution).
What do you think?