This PR is a follow up of bitcoin/bitcoin#24065 and removes the workaround which has already been removed in other places.
Moreover, this workaround won't be required even if bitcoin/bitcoin#25696 is ever merged.
ACK ba9a8e6cc1d1e9746f74e8c75af5c6c0a49f25c3