Temporary fix to avoid circular imports.