Revert "Another take at buffering"

This reverts commit 36233c3e7916da317257218b6b9c04032ab76c85.