Reverts the following two commits:

pkg/compiler/lib/src/serialization/equivalence.dart

Index: pkg/compiler/lib/src/serialization/equivalence.dart
diff --git a/pkg/compiler/lib/src/serialization/equivalence.dart b/pkg/compiler/lib/src/serialization/equivalence.dart
index 50318a83d1570a118cac78dfa79365e1afcde703..f3fc4f18dc61d5a46bfca9cf0167c7a8e82c747c 100644
--- a/pkg/compiler/lib/src/serialization/equivalence.dart
+++ b/pkg/compiler/lib/src/serialization/equivalence.dart
@@ -1965,8 +1965,7 @@ class NodeEquivalenceVisitor implements Visitor1<bool, Node> {
   }
 
   @override
-  bool visitNominalTypeAnnotation(
-      NominalTypeAnnotation node1, NominalTypeAnnotation node2) {
+  bool visitTypeAnnotation(TypeAnnotation node1, TypeAnnotation node2) {
     return testNodes(
             node1, node2, 'typeName', node1.typeName, node2.typeName) &&
         testNodes(node1, node2, 'typeArguments', node1.typeArguments,
@@ -1974,16 +1973,6 @@ class NodeEquivalenceVisitor implements Visitor1<bool, Node> {
   }
 
   @override
-  bool visitFunctionTypeAnnotation(
-      FunctionTypeAnnotation node1, FunctionTypeAnnotation node2) {
-    return testNodes(
-        node1, node2, 'returnType', node1.returnType, node2.returnType) &&
-        testNodes(node1, node2, 'formals', node1.formals, node2.formals) &&
-            testNodes(node1, node2, 'typeParameters', node1.typeParameters,
-                node2.typeParameters);
-  }
-
-  @override
   bool visitTypeVariable(TypeVariable node1, TypeVariable node2) {
     return testNodes(node1, node2, 'name', node1.name, node2.name) &&
         testNodes(node1, node2, 'bound', node1.bound, node2.bound);
@@ -1997,8 +1986,8 @@ class NodeEquivalenceVisitor implements Visitor1<bool, Node> {
         testNodes(
             node1, node2, 'returnType', node1.returnType, node2.returnType) &&
         testNodes(node1, node2, 'name', node1.name, node2.name) &&
-        testNodes(node1, node2, 'typeParameters', node1.templateParameters,
-            node2.templateParameters) &&
+        testNodes(node1, node2, 'typeParameters', node1.typeParameters,
+            node2.typeParameters) &&
         testNodes(node1, node2, 'formals', node1.formals, node2.formals);
   }