I think you may've undo the changes from https://github.com/huonw/rust/commit/2ed980fe253d0b7103ff0b16ce2aeecb03f09203#diff-1 (or, at least, not rebased on top of them).