Leftovers from PR14119

Summary:
This was leftover due to one or more out-of-order backport(s).

Partial backport of Core PR14119
https://github.com/bitcoin/bitcoin/pull/14119/files#diff-1fe2787f6e875dad2060f80b1ee79320L137-L148

Test Plan:

ninja check-functional

Reviewers: O1 Bitcoin ABC, #bitcoin_abc, Fabien

Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D6599