given how you ended up handling that in the rustio patch?