Comment 11 for bug 411691

(From update of attachment 398599)
I'm going to take care of this in bug 471219 though I may want to try to get a small portion of this into 1.9.1.x