Fixes #23789. The bytestring commit used here is unreleased; a release can be made when necessary. (cherry picked from commit bf885d7a)
