@_xhr_ Given that this code seems to be vendored all over the place, providing a fixed upstream version is not super unreasonable...