Revert "Revert "Kill Entity fix.""

This reverts commit 06bbf36562e9dea6208930d58dbb99649c538e2f.