This reverts commitaa8f135f64, reversing changes made to9a88bc260c. The patch causes hangs during flush. Also reverts parts of411231da75that impacted the unit test. Fixes #10897.
This reverts commitaa8f135f64, reversing changes made to9a88bc260c. The patch causes hangs during flush. Also reverts parts of411231da75that impacted the unit test. Fixes #10897.