Auto merge of #5577 - matklad:revert-deps-beta, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 27 May 2018 16:26:02 +0000 (16:26 +0000)
committerbors <bors@rust-lang.org>
Sun, 27 May 2018 16:26:02 +0000 (16:26 +0000)
Revert "Auto merge of #5461 - matklad:meta-rename, r=alexcrichton"

This reverts commit d0d3cb5ac963eb8c3f83d079b6a547992cac2cc4, reversing
changes made to 757112c39f8a5a4f6ffa0b7e29d23a56f03fb931.

It is not clear that the design is right, see
https://github.com/rust-lang/cargo/pull/5558#issuecomment-391791164

this is the backport sibling of https://github.com/rust-lang/cargo/pull/5576


Trivial merge