Revert "Crash"

This reverts commit 26b790f0f5f95a5c9701004c76a320e71516588a.