import fix.  Need to find out where the lack-of-import happend... I
suspect branch conflicts