Is there a circular dependency here?  Curious why you moved the import.