Get rid of some misplaced dependency management behaviour.

Change-Id: Ia5f7c47f80330542f0b48935796f722d5f2bcccb
Merge "Get rid of some misplaced dependency management behaviour."