Fixup release

This is identical to #3135. If that lands, then this should land against master.

## Verification

  - [ ] #3135 landed without issue.