> This simplifies the code and solves intermittent timeouts caused by commit rABC0c0123b0aa87
Note: I have not yet seen an intermittent timeout happen, but the conditions for this to happen exist after D10896
This is a backport of [[https://github.com/bitcoin/bitcoin/pull/21117 | core#21117]]