DO NOT MERGE [2.2] small writes batch force optimization

It's suspicious that this timeout is needed.