If that's the case, we should make sure in the future that patches are self contained, even if the plan is to push them together.