Uncycle dependency 2

Cyclic dependency insanity time!
don't think you meant to commit this change