Reverts the following two commits:

pkg/compiler/lib/src/resolution/constructors.dart

Index: pkg/compiler/lib/src/resolution/constructors.dart
diff --git a/pkg/compiler/lib/src/resolution/constructors.dart b/pkg/compiler/lib/src/resolution/constructors.dart
index cc02a99d7dbde196bbcd4c3e94a65bfdb1b46320..87c8cc72e0253561ea1dc62fdbd1ffab1e64193d 100644
--- a/pkg/compiler/lib/src/resolution/constructors.dart
+++ b/pkg/compiler/lib/src/resolution/constructors.dart
@@ -619,7 +619,7 @@ class ConstructorResolver extends CommonResolverVisitor<ConstructorResult> {
     return result;
   }
 
-  ConstructorResult visitNominalTypeAnnotation(NominalTypeAnnotation node) {
+  ConstructorResult visitTypeAnnotation(TypeAnnotation node) {
     // This is not really resolving a type-annotation, but the name of the
     // constructor. Therefore we allow deferred types.
     ResolutionDartType type = resolver.resolveTypeAnnotation(node,