This reverts commit aa8f135f64, reversing changes made to 9a88bc260c. The patch causes hangs during flush. Also reverts parts of 411231da75 that impacted the unit test. Fixes #10897.
aa8f135f64
9a88bc260c
411231da75