Would this resolve https://github.com/mozilla/rust/issues/3429 ?