Bring old imports back for more compatibility

5 jobs for compatibility in 6 minutes and 48 seconds (queued for 4 seconds)