Remove a circular dependency. Oops.