ENG-6910.  Doh. Broke the normal-path build.