Readd the dependencies AGAIN!

Change-Id: Ibc2c22a9253526088afadedb3f07cc8abc0cbd99