This reverts commit d22f9b07953801828ac4d906ca0cd5b924c93013.
Since D2522 fixes the issue from D2503, we can un-revert it.
Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.
Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.
Just redo the diff, instead of reverting a revert. Actual patch can be the same, but people don't need to play detective afterward.