Re-add dropped import.
More Python 3 fixes.