Workaround to avoid circular import when deploying on servers