Comment 1 for bug 8497

Probably needs to go upstream, please forward if so