Merging back split imports to make the frenchman happy