Revert "Kill Entity fix."

This reverts commit 1fbcabb82df3a7701b31b6479079ba8b5f0ed11a.