Revert "please don't crash"

This reverts commit 6cd1ae99795825161e0350fa03b4d7fdc964b49f.