diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
index 5f84ccd653..a0ce0c2101 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
@@ -21,7 +21,7 @@ public class MigrationTool {
 	public static UI ui = null;
 	public static Database db = null;
 
-	public static String MIGRATIONCOMMENT = "//%$//";
+	public static String MIGRATIONCOMMENT = "//%@//";
 
 	public static boolean printModuleInfo = false;
 	public static boolean doCritic = false;
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index e6d86b60b4..67e5bc2567 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -104,15 +104,9 @@ public final class SourceFileReplacer implements Common.ForDoAll {
 				mi.hashrequiredr9libs.add("UefiRuntimeServicesTableLib");
 			}
 		}
-		/*
 		// remove EFI_DRIVER_ENTRY_POINT
-		Pattern patentrypoint = Pattern.compile("EFI_DRIVER_ENTRY_POINT[^\\}]*\\}");
-		Matcher matentrypoint = patentrypoint.matcher(line);
-		if (matentrypoint.find()) {
-			MigrationTool.ui.println("Deleting Entry_Point");
-			line = matentrypoint.replaceAll("");
-		}
-		*/
+		wholeline = wholeline.replaceAll("(EFI_\\w+_ENTRY_POINT)", MigrationTool.MIGRATIONCOMMENT + " $1");
+		
 		// start replacing names
 		String r8thing;
 		String r9thing;