Partially revert dep changes in #5651#5711

bors merged 1 commit intorust-lang:masterrust-lang/cargo:masterfrom

alexcrichton:fix-stack-overflowalexcrichton/cargo:fix-stack-overflowCopy head branch name to clipboard