Revert "Buf fix"

This reverts commit 34d1f57baf21a14bb74e63dc580e3f761f2ebe1d.