Undo this change, it was written with the future in mind when entities are tracked.