Revert "Fixed weird bug with data tracker"

This reverts commit 95c1c8e4608419f25a727f783cd7fe470c2a2494.