Comment 6 for bug 1190547

John, how would/should we fix that in Grizzly?
It seems to me it's affected too, but that's the patch may be a bit invasive for this version. Is there a simpler version that could be used as a backport?