Comment 9 for bug 645536

No, the problem is still there lurking, ready to bite us next time
someone somehow ends up with two kernels.

I just fixed the immediate cause this time, we should make the code
more robust against this issue.

Thanks,

James