Abandoning in favor of stack starting with D12594 because lots of things have changed and there's not really 1:1 correspondence with old stack and new stack so I don't think it makes sense to update in place, change a bunch of child/parent diff relationships, etc.