diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/NodeEntity.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/NodeEntity.java
index 4592640f0..be2744e6e 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/NodeEntity.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/NodeEntity.java
@@ -33,11 +33,6 @@ public @interface NodeEntity {
      */
     boolean useShortNames() default true;
 
-    /**
-     * @return true if all fields of the entity will be indexed by default
-     */
-    boolean fullIndex() default false;
-
     /**
      * <p>
      * If partial is set, then construction of the node is delayed until the entity's id has been set by another persistent store. Only
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java
index a13d689be..0f0103e85 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java
@@ -49,9 +49,7 @@ class IndexingPropertyFieldAccessorListenerFactory<S extends PropertyContainer,
 
     private boolean isIndexed(final Field f) {
         final Indexed indexedAnnotation = getIndexedAnnotation(f);
-        if (indexedAnnotation != null) return true;
-        final NodeEntity entityAnnotation = f.getDeclaringClass().getAnnotation(NodeEntity.class);
-        return (entityAnnotation!=null && entityAnnotation.fullIndex());
+        return indexedAnnotation != null;
     }
 
     private boolean isPropertyField(final Field f) {