diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 01ae2c5cdcf..df60c4d4546 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,4 +1,10 @@
-2004-10-24 Alain Magloire
+2004-10-22 Mikhail Khodjaiants
+	Replaced the deprecated "evaluateExpressionTtoString" method of "ICDITarget.
+	* CDebugTarget.java
+	* CStackFrame.java
+	* CExtendedMemoryBlockRetrieval.java
+
+2004-10-22 Alain Magloire
 	Provide a context for ICDITarget.evaluateExpressionTtoString()
 	* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CExtendedMemoryBlockRetrieval.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CExtendedMemoryBlockRetrieval.java
index 1c07bfd7a25..2e28e740963 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CExtendedMemoryBlockRetrieval.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CExtendedMemoryBlockRetrieval.java
@@ -54,9 +54,6 @@ public class CExtendedMemoryBlockRetrieval implements IExtendedMemoryBlockRetrie
 		}
 		IDebugTarget target = selected.getDebugTarget();
 		if ( target instanceof CDebugTarget ) {
-			if ( address == null ) {
-				address = ((CDebugTarget)target).evaluateExpressionToString( expression );
-			}
 			if ( address != null ) {
 				try {
 					BigInteger a = ( address.startsWith( "0x" ) ) ? new BigInteger( address.substring( 2 ), 16 ) : new BigInteger( address ); //$NON-NLS-1$
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
index cb9741b14d5..c0bc6a8393e 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
@@ -16,7 +16,6 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
-
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.IAddress;
 import org.eclipse.cdt.core.IAddressFactory;
@@ -1866,16 +1865,6 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
 		fMemoryBlockRetrieval = memoryBlockRetrieval;
 	}
 
-	public String evaluateExpressionToString( String expression ) throws DebugException {
-		try {
-			return getCDITarget().evaluateExpressionToString( expression );
-		}
-		catch( CDIException e ) {
-			targetRequestFailed( e.getMessage(), null );
-		}
-		return null;
-	}
-
 	protected void failed( String message, Throwable e ) {
 		MultiStatus ms = new MultiStatus( CDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, message, null );
 		ms.add( new Status( IStatus.ERROR, CDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, e.getMessage(), e ) );
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java
index 4e63051cd90..939882283b9 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java
@@ -661,7 +661,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
 	 */
 	public String evaluateExpressionToString( String expression ) throws DebugException {
 		try {
-			return getCDITarget().evaluateExpressionToString( expression );
+			return getCDITarget().evaluateExpressionToString( getCDIStackFrame(), expression );
 		}
 		catch( CDIException e ) {
 			targetRequestFailed( e.getMessage(), null );