Unbreak package and import.