Revert r11881. metadata_test fails for yet to be discover reasons.

lib/compiler/implementation/elements/elements.dart

Index: lib/compiler/implementation/elements/elements.dart
===================================================================
--- lib/compiler/implementation/elements/elements.dart	(revision 11888)
+++ lib/compiler/implementation/elements/elements.dart	(working copy)
@@ -648,7 +648,9 @@
 
   DartType get type => variables.type;
 
-  bool isInstanceMember() => variables.isInstanceMember();
+  bool isInstanceMember() {
+    return isMember() && !modifiers.isStatic();
+  }
 
   // Note: cachedNode.getBeginToken() will not be correct in all
   // cases, for example, for function typed parameters.
@@ -757,19 +759,6 @@
     }
     return result;
   }
-
-  bool isInstanceMember() {
-    return isMember() && !modifiers.isStatic();
-  }
-
-  Scope buildScope() {
-    Scope result = new VariableScope(enclosingElement.buildScope(), this);
-    if (enclosingElement.isClass()) {
-      ClassScope clsScope = result.parent;
-      clsScope.inStaticContext = !isInstanceMember();
-    }
-    return result;
-  }
 }
 
 class ForeignElement extends Element {
@@ -996,15 +985,6 @@
     result.type = type;
     return result;
   }
-
-  Scope buildScope() {
-    Scope result = new MethodScope(enclosingElement.buildScope(), this);
-    if (enclosingElement.isClass()) {
-      ClassScope clsScope = result.parent;
-      clsScope.inStaticContext = !isInstanceMember() && !isConstructor();
-    }
-    return result;
-  }
 }