Fixed imports again.  Not really sure how they got un-fixed.

I thought they were working before.  Maybe I ran the wrong tests or
something.