fixes #6475 use Tracker adapter rather at all times in tracker