[beta] Partially revert dep changes in #5651#5722

Merged

bors merged 1 commit intorust-lang:rust-1.28.0from alexcrichton:beta-next

Jul 13, 2018

+128-39

Commits on Jul 13, 2018

Partially revert dep changes in rust-lang#5651
alexcrichton
committed