Fix a circular dependency.