Reverted change to tracking code