ENG-5380: Fix broken build after merge.
This will probably happen again until this disruptive change is merged.