ENG-5245: Fix bad merge.