Cyclic dependency detection is hard

Change-Id: I1500f63414feac52ee89a95e9b3febde181bd243