Will (hopefully) be addressed by https://github.com/mozilla/rust/pull/9349.