diff --git a/jedi/_compatibility.py b/jedi/_compatibility.py
index 48dd1e66..553a3905 100644
--- a/jedi/_compatibility.py
+++ b/jedi/_compatibility.py
@@ -211,12 +211,6 @@ def literal_eval(string):
     return ast.literal_eval(string)
 
 
-try:
-    from itertools import zip_longest
-except ImportError:
-    from itertools import izip_longest as zip_longest  # Python 2  # noqa: F401
-
-
 def utf8_repr(func):
     """
     ``__repr__`` methods in Python 2 don't allow unicode objects to be
diff --git a/jedi/inference/arguments.py b/jedi/inference/arguments.py
index aa200fdb..29e7dbeb 100644
--- a/jedi/inference/arguments.py
+++ b/jedi/inference/arguments.py
@@ -1,8 +1,8 @@
 import re
+from itertools import zip_longest
 
 from parso.python import tree
 
-from jedi._compatibility import zip_longest
 from jedi import debug
 from jedi.inference.utils import PushBackIterator
 from jedi.inference import analysis
@@ -189,8 +189,6 @@ class TreeArguments(AbstractArguments):
                 iterators = [_iterate_star_args(self.context, a, el, funcdef)
                              for a in arrays]
                 for values in list(zip_longest(*iterators)):
-                    # TODO zip_longest yields None, that means this would raise
-                    # an exception?
                     yield None, get_merged_lazy_value(
                         [v for v in values if v is not None]
                     )
diff --git a/jedi/inference/base_value.py b/jedi/inference/base_value.py
index f8a8ff09..e51f3e66 100644
--- a/jedi/inference/base_value.py
+++ b/jedi/inference/base_value.py
@@ -8,10 +8,12 @@ just one.
 """
 from functools import reduce
 from operator import add
+from itertools import zip_longest
+
 from parso.python.tree import Name
 
 from jedi import debug
-from jedi._compatibility import zip_longest, unicode
+from jedi._compatibility import unicode
 from jedi.parser_utils import clean_scope_docstring
 from jedi.inference.helpers import SimpleGetItemNotFound
 from jedi.inference.utils import safe_property