Reverts revert of buffer util removal

This reverts commit ef0e03547d8de729418db0bb5a0264f8f0025e32.