Revert "Panic recovery nonsense...?"

This reverts commit 0101536358ec7cfe8a097e610617a04117a8f1ce.