Revert to the old way of making scratch buffers. Less flaky.