Initial PR: https://github.com/bitcoin/bitcoin/pull/19227 'Reverting' PR: https://github.com/bitcoin/bitcoin/pull/19897