diff --git a/jedi/inference/gradual/annotation.py b/jedi/inference/gradual/annotation.py
index 2ad8f979..05416111 100644
--- a/jedi/inference/gradual/annotation.py
+++ b/jedi/inference/gradual/annotation.py
@@ -14,7 +14,7 @@ from jedi.inference.cache import inference_state_method_cache
 from jedi.inference.base_value import ValueSet, NO_VALUES
 from jedi.inference.gradual.base import DefineGenericBaseClass, GenericClass
 from jedi.inference.gradual.generics import TupleGenericManager
-from jedi.inference.gradual.type_var import TypeVar, TypeVarWrapper
+from jedi.inference.gradual.type_var import TypeVar
 from jedi.inference.helpers import is_string
 from jedi.inference.compiled import builtin_from_name
 from jedi.inference.param import get_executed_param_names
@@ -281,7 +281,7 @@ def infer_return_for_callable(arguments, param_values, result_values):
 
     return ValueSet.from_sets(
         v.define_generics(all_type_vars)
-        if isinstance(v, (DefineGenericBaseClass, TypeVar, TypeVarWrapper))
+        if isinstance(v, (DefineGenericBaseClass, TypeVar))
         else ValueSet({v})
         for v in result_values
     ).execute_annotation()
diff --git a/jedi/inference/gradual/type_var.py b/jedi/inference/gradual/type_var.py
index 04dce8ab..1af5870e 100644
--- a/jedi/inference/gradual/type_var.py
+++ b/jedi/inference/gradual/type_var.py
@@ -102,12 +102,7 @@ class TypeVar(BaseTypingValue):
         else:
             if found:
                 return found
-
-        classes = self._get_classes()
-        if not classes:
-            return ValueSet({self})
-
-        return ValueSet(TypeVarWrapper(cls, self) for cls in classes)
+        return ValueSet({self})
 
     def execute_annotation(self):
         return self._get_classes().execute_annotation()
@@ -127,15 +122,6 @@ class TypeVar(BaseTypingValue):
         return '<%s: %s>' % (self.__class__.__name__, self.py__name__())
 
 
-class TypeVarWrapper(ValueWrapper):
-    def __init__(self, wrapped_value, original_value):
-        super(TypeVarWrapper, self).__init__(wrapped_value)
-        self._original_value = original_value
-
-    def define_generics(self, type_var_dict):
-        return self._original_value.define_generics(type_var_dict)
-
-
 class TypeWrapper(ValueWrapper):
     def __init__(self, wrapped_value, original_value):
         super(TypeWrapper, self).__init__(wrapped_value)