diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java
index bdd9b89b8b3..beb3a296121 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java
@@ -19,7 +19,7 @@ import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnectorInfo;
 
 public class TerminalViewControlFactory {
 	public static ITerminalViewControl makeControl(ITerminalListener target, Composite wndParent, ITerminalConnectorInfo[] connectors) {
-		if(TerminalPlugin.isOptionEnabled("org.eclipse.tm.terminal/debug/use_old_implementation")) //$NON-NLS-1$
+		if(System.getProperty("org.eclipse.tm.terminal.OldImplementation")!=null || TerminalPlugin.isOptionEnabled("org.eclipse.tm.terminal/debug/use_old_implementation")) //$NON-NLS-1$ //$NON-NLS-2$
 			return new TerminalControl(target, wndParent, connectors);
 		else
 			return new VT100TerminalControl(target, wndParent, connectors);