--- a/graal/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java	Mon Apr 20 11:02:30 2015 -0700
+++ b/graal/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java	Mon Apr 20 14:22:01 2015 +0200
@@ -276,14 +276,7 @@
     @Override
     @TruffleBoundary
     public Property getProperty(Object key) {
-        PropertyMap current = this.propertyMap;
-        while (current.getLastProperty() != null) {
-            if (current.getLastProperty().getKey().equals(key)) {
-                return current.getLastProperty();
-            }
-            current = current.getParentMap();
-        }
-        return null;
+        return propertyMap.get(key);
     }
 
     protected final void addDirectTransition(Transition transition, ShapeImpl next) {