Preliminary functionality fix before dealing with Buf/Blob rework.