Comment 5 for bug 165184

I've looked at this briefly. I'm not convinced this is the correct
solution.