Revert "Revert "Also removes buffer util fix.""

This reverts commit a1d746c00529ab67aab04f7e336a77b29e60dd24.