Revert "Removing default buffering"

This reverts commit ed5c2e0b2278d407f7e01a0cdb55268990353603.