Revert "Always use smallest buffer size available. Not sure what was up with old"

This reverts commit ecc6d3f2b2c4f7e5238336909280b92c9449a274.