diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java
index 5ee31558fa4..8277708204e 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java
@@ -89,7 +89,15 @@ public class FinalLaunchSequence extends ReflectionSequence {
 					"stepSetNonStop",   //$NON-NLS-1$
 					"stepSetAutoLoadSharedLibrarySymbols",   //$NON-NLS-1$
 					"stepSetSharedLibraryPaths",   //$NON-NLS-1$
-					"stepSetSourceLookupPath",   //$NON-NLS-1$
+					
+					// -environment-directory with a lot of paths could
+					// make setting breakpoint incredibly slow, which makes
+					// the debug session un-workable.  We simply stop
+					// using it because it's usefulness is unclear.
+					// Bug 225805
+					//
+					// "stepSetSourceLookupPath",   //$NON-NLS-1$
+					
 					// For post-mortem launch only
 					"stepSpecifyCoreFile",   //$NON-NLS-1$
 					// For remote-attach launch only
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
index 78127a5359f..029085f530d 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
@@ -340,19 +340,25 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence {
                     requestMonitor.done();
         		}
         	}},
-    	/*
-    	 * Setup the source paths
-    	 */
-        new Step() { 
-    		@Override
-            public void execute(RequestMonitor requestMonitor) {
-                CSourceLookup sourceLookup = fTracker.getService(CSourceLookup.class);
-                CSourceLookupDirector locator = (CSourceLookupDirector)fLaunch.getSourceLocator();
-        		ISourceLookupDMContext sourceLookupDmc = (ISourceLookupDMContext)fCommandControl.getContext();
 
-                sourceLookup.setSourceLookupPath(sourceLookupDmc, locator.getSourceContainers(), requestMonitor);
-            }},
-            
+// -environment-directory with a lot of paths could
+// make setting breakpoint incredibly slow, which makes
+// the debug session un-workable.  We simply stop
+// using it because it's usefulness is unclear.
+// Bug 225805
+//    	/*
+//    	 * Setup the source paths
+//    	 */
+//        new Step() { 
+//    		@Override
+//            public void execute(RequestMonitor requestMonitor) {
+//                CSourceLookup sourceLookup = fTracker.getService(CSourceLookup.class);
+//                CSourceLookupDirector locator = (CSourceLookupDirector)fLaunch.getSourceLocator();
+//        		ISourceLookupDMContext sourceLookupDmc = (ISourceLookupDMContext)fCommandControl.getContext();
+//
+//                sourceLookup.setSourceLookupPath(sourceLookupDmc, locator.getSourceContainers(), requestMonitor);
+//            }},
+  
             // Below steps are specific to JTag hardware debugging
             
         /*