For ENG-6043, factor out one more location