Reverted to older tracking code format.