There are several closely-related issues whose fixes we may need to sequence carefully to avoid creating new problems so I thought it'd be easiest to have a central discussion of that here in this tracking issue.
(There are some other issues that I think we can ignore for these purposes: #6066 and #7311.)
In particular:
- Fixing either 6177 or 7304 would have no practical impact until both are fixed.
- Fixing both 6177 and 7304 before fixing 7309 would break zone expungement (that's basically what 7309 is describing).
- 7312 is obviated by fixing 6177 and 7304.