Much easier to cherry-pick or revert that way.