Revert "removing unneeded breaks"

This reverts commit 3650f7f8eb923d0123b028c1af768ae3a8fa223d.
Revert "Revert "removing unneeded breaks""

This reverts commit 3ac0d4d249e4f5975270a99b79e1f4ba2d92c53c.
base config