Second attempt to simplify import.