Apart from tests, it is only used in one place, so there is no need for
an alias.
This is a partial backport of [[https://github.com/bitcoin/bitcoin/pull/25648 | core#25648]]
https://github.com/bitcoin/bitcoin/pull/25648/commits/fa8a7f01fe1b6db98097021276ed5d929faadbec
Depends on D15754