diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java
index bd07ea12822..e3ec3aa74e7 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java
@@ -57,7 +57,7 @@ public class FolderInfoModification extends ToolListModification implements IFol
 		fSelectedToolChain = (ToolChain)foInfo.getToolChain();
 		fRealToolChain = (ToolChain)ManagedBuildManager.getRealToolChain(fSelectedToolChain);
 	}
-	
+
 	public FolderInfoModification(FolderInfo foInfo, FolderInfoModification base) {
 		super(foInfo, base);
 		fSelectedToolChain = base.fSelectedToolChain;
@@ -191,7 +191,9 @@ public class FolderInfoModification extends ToolListModification implements IFol
 	public void setToolChain(IToolChain tc){
 		if(tc == fSelectedToolChain)
 			return;
-		
+	
+		applyToolChain((ToolChain)tc);
+
 		fSelectedToolChain = (ToolChain)tc;
 		IToolChain newReal = ManagedBuildManager.getRealToolChain(tc);
 		if(newReal == fRealToolChain)
@@ -200,7 +202,7 @@ public class FolderInfoModification extends ToolListModification implements IFol
 		fRealToolChain = (ToolChain)newReal;
 
 //		setProjectTools(tc.getTools());
-		applyToolChain(fSelectedToolChain);
+//		applyToolChain(fSelectedToolChain);
 		clearToolInfo(tc.getTools());
 		fCurrentCompatibilityInfo = null;