Issue #18081: Back out temporary changeset, 2a9e1eb3719c, to merge new patch.

If buildbots run before next push, test_logging will (temporarily) fail.