I think the change will need to take place in https://github.com/rust-lang/highfive to make things smoother. cc @QuietMisdreavus