Auto merge of #5722 - alexcrichton:beta-next, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 13 Jul 2018 20:44:11 +0000 (20:44 +0000)
committerbors <bors@rust-lang.org>
Fri, 13 Jul 2018 20:44:11 +0000 (20:44 +0000)
[beta] Partially revert dep changes in #5651

This is a beta backport of https://github.com/rust-lang/cargo/pull/5711


Trivial merge