Revert "Cargo stuff earlyness"

This reverts commit 443a654d1403ac2d3c98af74bf3cfb88d6b4922a.
Revert "Revert "Cargo stuff earlyness""

This reverts commit e7b929b80a4dbaa685655f01b109177b84f63f57.
Merge remote-tracking branch 'origin/master'