Remove legacy save-breaking behavior option

Reverts previous commit
Fix revert conflicts