Tracking issue so that we can make sure this work appears on our project boards. https://github.com/oxidecomputer/omicron/pull/5036/ includes the fixes for this.