Merge "Re-add the break statement that was accidentally removed."