I may have actually hit this during rebasing, will revert (there's actually [a couple changes](https://github.com/mozilla/rust/pull/11595/files?w=0#diff-3d713cb57efd3cff355e4ecfe8b74a04R358) in there).