Switching to EntIndex, reverted EntityRemoved