Remove self-referencing dependency

Change-Id: Ib8b7c6935c8f17d3150bf56614b40ad5f2c1565f