Comment 18 for bug 305286

if someone can propose a fix (in form of a focused bugfix, not a request
that includes hundres of other unrelated changes), we can SRU this bug.