diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF
index 1cd40ffa64a..cae0b5afdd9 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF
+++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF
@@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.debug.core;bundle-version="3.5.0",
  org.eclipse.debug.ui;bundle-version="3.5.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Eclipse-AutoStart: true
+Bundle-ActivationPolicy: lazy
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/build.properties b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/build.properties
index 802b71148c9..f996009af2d 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/build.properties
+++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/build.properties
@@ -4,6 +4,5 @@ bin.includes = plugin.xml,\
                META-INF/,\
                .,\
                icons/,\
-               contexts.xml,\
                about.html
 src.includes = about.html