Return entity-tracking field other to inteded usage.

As of the latest revision of this PR, logic is now reworked.