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

This reverts commit ef0e03547d8de729418db0bb5a0264f8f0025e32.