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

This reverts commit ce38d3fb4a536ff9f62760ceb7a3cab5880b29db.