Comment 26 for bug 161028

I've pushed a fix into trunk (rev 235, 236). The changes were as minimal as possibly while hopefully avoiding any visual regressions and still accomplishing their goal.