diff --git a/.travis.yml b/.travis.yml
index e847274e62..5cad7574d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,7 @@ dart:
 env:
   - DARTDOC_BOT=main
   - DARTDOC_BOT=flutter
-  # Disable pending #2036
-  #- DARTDOC_BOT=sdk-analyzer
+  - DARTDOC_BOT=sdk-analyzer
   - DARTDOC_BOT=packages
   - DARTDOC_BOT=sdk-docs
 script: ./tool/travis.sh
diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
index 2d8b79183c..a373630712 100644
--- a/lib/src/element_type.dart
+++ b/lib/src/element_type.dart
@@ -447,7 +447,7 @@ class CallableGenericTypeAliasElementType extends ParameterizedElementType
   ElementType get returnType {
     if (_returnType == null) {
       _returnType = ElementType.from(
-          returnElement.modelType.type, library, packageGraph, this);
+          type.returnType, library, packageGraph, this);
     }
     return _returnType;
   }