EAGLESIX-2651: Nary: preemptively switch to DepsTracker