Revert "Better buffer."

This reverts commit 124e514f21c69d2ab55a3de7aaea5fe224ddaa5d.
Revert "Revert "Better buffer.""

This reverts commit 566a7511c58c0285187e5c019195bdd45df9afe2.