Revert "Fixed for removal of buffer util fix as well."

This reverts commit 28b3d083602b4085857b2900bb9aca9e03dfbb69.