Revert "Also removes buffer util fix."

This reverts commit e3352a1637b9b288287c8bbff0b4a8a3582711d8.