For ENG-5860, bring back missing break