This breaks the dependency loop introduced earlier on. Change-Id: I2a943a7759152a37c42281fab8e7046125a42b20