Revert "EntityTracker synch"

This reverts commit 0e02acaef9583ce37291d4d9e5ca8af86c067dd6.