Revert "Revert "Revert "Revert "Kill Entity fix.""""

This reverts commit 4abcbe1ec9aa67c8978f00bc10450e70edd3346e.
Revert "Revert "Revert "Revert "Revert "Kill Entity fix."""""

This reverts commit 76f84a0f052054644f2051f93651347f1e52af23.