diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
index 8b25597dd53..f30b738433e 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
@@ -343,11 +343,10 @@ public class CDebugUIPlugin extends AbstractUIPlugin implements ISelectionListen
 						try
 						{
 							((ISwitchToThread)((IThread)element).getDebugTarget()).setCurrentThread( (IThread)element );
-							// The sameThread() method is doing the wrong calculations, let the implementation handle it.
-							//if ( !sameThread( (IDebugElement)element ) )
-							//{
-							//	((ISwitchToThread)((IThread)element).getDebugTarget()).setCurrentThread( (IThread)element );
-							//}
+							if ( !sameThread( (IDebugElement)element ) )
+							{
+								((ISwitchToThread)((IThread)element).getDebugTarget()).setCurrentThread( (IThread)element );
+							}
 						}
 						catch( DebugException e )
 						{