Revert "Fix crash"

This reverts commit 2609464185577c0ca3ce8cd868460848d706f492.