Reverts the following two commits:

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

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// Functions for asserting equivalence across serialization.
 
 library dart2js.serialization.equivalence;
 
 import '../closure.dart';
 import '../common/resolution.dart';
@@ skipping 1947 matching lines @@
         testTokens(node1, node2, 'finallyKeyword', node1.finallyKeyword,
             node2.finallyKeyword) &&
         testNodes(node1, node2, 'tryBlock', node1.tryBlock, node2.tryBlock) &&
         testNodes(node1, node2, 'catchBlocks', node1.catchBlocks,
             node2.catchBlocks) &&
         testNodes(node1, node2, 'finallyBlock', node1.finallyBlock,
             node2.finallyBlock);
   }
 
   @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,
             node2.typeArguments);
   }
 
   @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);
   }
 
   @override
   bool visitTypedef(Typedef node1, Typedef node2) {
     return testTokens(node1, node2, 'typedefKeyword', node1.typedefKeyword,
             node2.typedefKeyword) &&
         testTokens(node1, node2, 'endToken', node1.endToken, node2.endToken) &&
         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);
   }
 
   @override
   bool visitVariableDefinitions(
       VariableDefinitions node1, VariableDefinitions node2) {
     return testNodes(
             node1, node2, 'metadata', node1.metadata, node2.metadata) &&
         testNodes(node1, node2, 'type', node1.type, node2.type) &&
         testNodes(
@@ skipping 44 matching lines @@
 }
 
 bool areMetadataAnnotationsEquivalent(
     MetadataAnnotation metadata1, MetadataAnnotation metadata2) {
   if (metadata1 == metadata2) return true;
   if (metadata1 == null || metadata2 == null) return false;
   return areElementsEquivalent(
           metadata1.annotatedElement, metadata2.annotatedElement) &&
       areConstantsEquivalent(metadata1.constant, metadata2.constant);
 }