Yeah, but I've made various fixes in the library without upstreaming them. So it may be a messy process. Hopefully we have tests for that. But right now, I recommend to just bring the patch here and file updating the library for another issue.
Originally posted by @tomholub in #5310 (comment)