Really only import if it's needed.

I'll leave this to Fred to merge in case he has other comments.