diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
index db6e9da77f2..e63c0955edf 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
@@ -1145,9 +1145,6 @@ public abstract class CBuildConfiguration extends PlatformObject
 	public void shutdown() {
 		// TODO persist changes
 		
-		// Bug 536884 - Turn off any manual future scanner refresh
-		toolChain.setProperty(NEED_REFRESH,	"false"); //$NON-NLS-1$
-
 		// Trigger a reindex if anything changed
 		// TODO be more surgical
 		if (infoChanged) {