Revert "Fix: Crash when entityName not implemented."

This reverts commit 8c679c8f27803510610d412815e75d0e07c79bef.