diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
index 4640d197e9f..002e6d4ddde 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
@@ -377,32 +377,33 @@ public class IndexManager extends JobManager{
 	}
 	
 	public ICDTIndexer getIndexerForProject(IProject project){
-		ICDTIndexer indexer = null;
-		try {
-			//Make sure we're not updating list
-			monitor.enterRead();
-			
-			//See if indexer exists already
-			indexer = (ICDTIndexer) indexerMap.get(project);
-			
-			//Create the indexer and store it
-			if (indexer == null) {
-				monitor.exitRead();
-				try {
-					monitor.enterWrite();
-					indexer = getIndexer(project);
-					//Make sure we're not putting null in map
-					if (indexer != null)
-						indexerMap.put(project,indexer);
-				} finally{
-					monitor.exitWriteEnterRead();
-				}
-			}
-			return indexer;
-				
-			}finally {
-				monitor.exitRead();
-			}
+		return null;
+//		ICDTIndexer indexer = null;
+//		try {
+//			//Make sure we're not updating list
+//			monitor.enterRead();
+//			
+//			//See if indexer exists already
+//			indexer = (ICDTIndexer) indexerMap.get(project);
+//			
+//			//Create the indexer and store it
+//			if (indexer == null) {
+//				monitor.exitRead();
+//				try {
+//					monitor.enterWrite();
+//					indexer = getIndexer(project);
+//					//Make sure we're not putting null in map
+//					if (indexer != null)
+//						indexerMap.put(project,indexer);
+//				} finally{
+//					monitor.exitWriteEnterRead();
+//				}
+//			}
+//			return indexer;
+//				
+//			}finally {
+//				monitor.exitRead();
+//			}
 	}
 	
 	public ICDTIndexer getDefaultIndexer(IProject project) throws CoreException {
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
index b8aeedecc3f..9d820ac5490 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
@@ -295,9 +295,6 @@ public class CCorePlugin extends Plugin {
 		fCoreModel = CoreModel.getDefault();
 		fCoreModel.startup();
 
-		//Fired up the indexer
-		fCoreModel.startIndexing();
-		
 		// Fire up the PDOM
 		pdomManager = new PDOMManager();
 		pdomManager.startup();