Credit to ajtowns for this suggestion, thanks!
This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/24050 | core#24050]]
https://github.com/bitcoin/bitcoin/pull/24050/commits/dd79dad17545424d145e846026518d70da594380
https://github.com/bitcoin/bitcoin/pull/24050/commits/6c23c415613d8b847e6f6a2f872be893da9f4384
Depends on D12992