This reverts commit 0b516da95b, reversing changes made to 30199552ac. It breaks cluster.random_failures.test_random_failures.test_random_failures in debug mode (at least). Fixes #24513
0b516da95b
30199552ac