Comment 15 for bug 973241

Looks reasonable; but let's get upstream input on that patch before including it.