ENG-4997: Revert thing I forgot to revert to fix bug.