bcd179be0e fixed this for recent imports, but did not address imports from before it was merged.
bcd179be0e