Fix a circular import that causes errors in certain cases.