41413: release-19.2: Revert "Merge #41307" r=andreimatei a=andreimatei

Backport 1/1 commits from #41406.

/cc @cockroachdb/release

---

This reverts commit 1c99165c39c3714f1ce9986bff75ce517f977630, reversing
changes made to e6e916177e9a4f6f03bcee4b2eb272169c8ccb0f.

Somehow #41307 broke some Jepsen tests. Reversing while I investigate.

Fixes #41376
Fixes #41364
Fixes #41363
Fixes #41362

Release justification: broke Jepsen

Release note: None


Co-authored-by: Andrei Matei <andrei@cockroachlabs.com>