Getting increasingly hackish to fix import bug.