Revert "td tracking fix"

This reverts commit 4761605ec351f491d7c8852080a9c8cae7968c4d.