Revert "Reset after tracking begins"

This reverts commit 1e6305e6825ad13adb3916becf94ea65bdaa945b.