Revert "Hopefully got crash resistance."

This reverts commit 242ad5e2f47e8c7a283211fbbba3634b147c19a1.