ENG-4881 Fix legacy mode.