Fixing fossilized imports
Fixing fossilized imports, continued