For ENG-6153, bring back a bit more code