Removing a circular dependency.