Try something else to fix circular import -- not sure why I can't explicitly specify what to import here...