[squash] this seems less messy way to fix import error