Revert "Tracking the tracker as a property."

This reverts commit a38b56eac23176cb91def0dfbf05468cb9755fc5.