Revert "Changes to Buff"

This reverts commit a4ad19bfbc717f7b7ebe0145693de01aa5502dac.