MODE-1910 Swap out custom buffer size logic with bestBufferSize