For ENG-4709, bring back accidentally stripped code