'Revert "Change more incorrect dependencies"

This reverts commit 63821c2f0f2d546e104250a043b0e903024d579b.

Change-Id: I6e19c73615867602daf5a0c98a0b931d887bc7c8