diff --git a/jedi/api/helpers.py b/jedi/api/helpers.py
index 06566aa5..db90b72b 100644
--- a/jedi/api/helpers.py
+++ b/jedi/api/helpers.py
@@ -9,13 +9,11 @@ from parso.python.parser import Parser
 from parso.python import tree
 
 from jedi._compatibility import u
-from jedi.evaluate.base_context import NO_CONTEXTS, ContextSet
+from jedi.evaluate.base_context import NO_CONTEXTS
 from jedi.evaluate.syntax_tree import eval_atom
 from jedi.evaluate.helpers import evaluate_call_of_leaf
 from jedi.evaluate.compiled import get_string_context_set
 from jedi.cache import call_signature_time_cache
-from jedi.evaluate.gradual.conversion import convert_names
-from jedi.evaluate.names import TreeNameDefinition
 
 
 CompletionParts = namedtuple('CompletionParts', ['path', 'has_dot', 'name'])
@@ -143,13 +141,7 @@ def evaluate_goto_definition(evaluator, context, leaf):
     if leaf.type == 'name':
         # In case of a name we can just use goto_definition which does all the
         # magic itself.
-        print(leaf.parent)
-        if leaf.parent.type in ('trailer', 'error_node', 'dotted_name'):
-            return evaluator.goto_definitions(context, leaf)
-        name = TreeNameDefinition(context, leaf)
-        return ContextSet.from_sets(
-            name.infer() for name in convert_names([name], prefer_stubs=True)
-        )
+        return evaluator.goto_definitions(context, leaf)
 
     parent = leaf.parent
     definitions = NO_CONTEXTS