MDL-26294 fix byteserving regression