As you asked, here is the panic-on-oops patch as pulled from the 2.5 tree
(when it was first applied). There are two lines in it that I'm not sure of,
but I'll leave it to you to decide whether they should be there. I didn't
apply them, myself.
--Russell