diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
index 2884312..6ad4053 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
@@ -83,8 +83,6 @@ public class InitialContent implements RepositoryInitializer, NodeTypeConstants
             NodeBuilder nt = 
                     IndexUtils.createIndexDefinition(index, "nodetype", true, false,
                     ImmutableList.of(JCR_PRIMARYTYPE, JCR_MIXINTYPES), null);
-            // the cost of using the property index for "@primaryType is not null" is very high
-            nt.setProperty(IndexConstants.ENTRY_COUNT_PROPERTY_NAME, Long.valueOf(Long.MAX_VALUE));
             IndexUtils.createReferenceIndex(index);
             
             index.child("counter")
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryPlanTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryPlanTest.java
index 9fc57d2..075db38 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryPlanTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryPlanTest.java
@@ -233,9 +233,8 @@ public class QueryPlanTest extends AbstractRepositoryTest {
         assertTrue(it.hasNext());
         String plan = it.nextRow().getValue("plan").getString();
         // should not use the index on "jcr:primaryType"
-        assertEquals("[nt:base] as [nt:base] /* traverse \"*\" " + 
-                "where [nt:base].[node2/node3/jcr:primaryType] is not null */", 
-                plan);
+        assertEquals("[nt:base] as [nt:base] /* property nodetype IS NOT NULL "
+                     + "where [nt:base].[node2/node3/jcr:primaryType] is not null */", plan);
         
         // verify the result
         q = qm.createQuery(sql2, Query.JCR_SQL2);
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java
index 5f47680..c1bcf46 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java
@@ -52,6 +52,8 @@ import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.jackrabbit.commons.cnd.CndImporter;
 import org.apache.jackrabbit.oak.jcr.AbstractRepositoryTest;
 import org.apache.jackrabbit.oak.jcr.NodeStoreFixture;
+import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
+import org.apache.jackrabbit.oak.spi.query.PropertyValues;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -78,11 +80,6 @@ public class QueryTest extends AbstractRepositoryTest {
         index.setProperty("propertyNames", new String[] { "lastMod" },
                 PropertyType.NAME);
 
-        // disable the nodetype index
-        Node nodeTypeIndex = root.getNode("oak:index").getNode("nodetype");
-        nodeTypeIndex.setProperty("declaringNodeTypes", new String[] {
-            }, PropertyType.NAME);
-
         // add 10 nodes
         Node test = root.addNode("test");
         for (int i = 0; i < 10; i++) {