Fixed circular import that caused a build error.