Revert "Not crashing anymore"

This reverts commit 7c911a3cda75048ead9862bffeec3c36f7494e12.