revert to old defer/panic/recover handling (have to think about it some more...)