WIP, fix overzealous import cleanup.