diff --git a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.addin b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.addin
index cd61b15a54..3c129771c6 100644
--- a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.addin
+++ b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.addin
@@ -20,10 +20,12 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/BackendBindings/ProjectOptions/AllManaged">
-		<OptionPanel id          = "CodeAnalysis"
+		
+		<!--<OptionPanel id          = "CodeAnalysis"
 		             label       = "${res:ICSharpCode.CodeAnalysis}"
-		             class       = "ICSharpCode.CodeAnalysis.AnalysisProjectOptionsPanel"/>
-	<OptionPanel id          = "CodeAnalysis"
+		             class       = "ICSharpCode.CodeAnalysis.AnalysisProjectOptionsPanel"/>-->
+		
+		<OptionPanel id          = "CodeAnalysis"
 		             label       = "${res:ICSharpCode.CodeAnalysis}"
 		             class       = "ICSharpCode.CodeAnalysis.AnalysisProjectOptionsPanelXaml"/>
 	</Path>
diff --git a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj
index f15494109a..8f63d8d222 100644
--- a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj
+++ b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj
@@ -61,12 +61,12 @@
       <Link>Configuration\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Src\AnalysisProjectOptionsPanel.cs" />
-    <Compile Include="Src\AnalysisProjectOptions.Designer.cs">
-      <DependentUpon>AnalysisProjectOptions.cs</DependentUpon>
+    <Compile Include="Src\old_AnalysisProjectOptions.Designer.cs">
+      <DependentUpon>old_AnalysisProjectOptions.cs</DependentUpon>
     </Compile>
-    <Compile Include="Src\AnalysisProjectOptions.cs" />
-    <EmbeddedResource Include="Src\AnalysisProjectOptions.resx">
-      <DependentUpon>AnalysisProjectOptions.cs</DependentUpon>
+    <Compile Include="Src\old_AnalysisProjectOptions.cs" />
+    <EmbeddedResource Include="Src\old_AnalysisProjectOptions.resx">
+      <DependentUpon>old_AnalysisProjectOptions.cs</DependentUpon>
     </EmbeddedResource>
     <Compile Include="Src\AnalysisProjectOptionsPanelXaml.xaml.cs">
       <DependentUpon>AnalysisProjectOptionsPanelXaml.xaml</DependentUpon>
diff --git a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanel.cs b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanel.cs
index b55773ed69..211241317f 100644
--- a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanel.cs
+++ b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanel.cs
@@ -14,7 +14,7 @@ namespace ICSharpCode.CodeAnalysis
 		{
 			InitializeHelper();
 			
-			AnalysisProjectOptions po = new AnalysisProjectOptions();
+			old_AnalysisProjectOptions po = new old_AnalysisProjectOptions();
 			po.Dock = DockStyle.Fill;
 			Controls.Add(po);
 			
diff --git a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptions.Designer.cs b/src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisProjectOptions.Designer.cs
similarity index 98%
rename from src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptions.Designer.cs
rename to src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisProjectOptions.Designer.cs
index 534c5b8020..b98b30f72d 100644
--- a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptions.Designer.cs
+++ b/src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisProjectOptions.Designer.cs
@@ -3,7 +3,7 @@
 
 namespace ICSharpCode.CodeAnalysis
 {
-	partial class AnalysisProjectOptions : System.Windows.Forms.UserControl
+	partial class old_AnalysisProjectOptions : System.Windows.Forms.UserControl
 	{
 		/// <summary>
 		/// Designer variable used to keep track of non-visual components.
diff --git a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptions.cs b/src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisProjectOptions.cs
similarity index 98%
rename from src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptions.cs
rename to src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisProjectOptions.cs
index 316e7ddd93..9c9ddbb655 100644
--- a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptions.cs
+++ b/src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisProjectOptions.cs
@@ -14,11 +14,11 @@ using ICSharpCode.SharpDevelop.Project;
 
 namespace ICSharpCode.CodeAnalysis
 {
-	public partial class AnalysisProjectOptions
+	public partial class old_AnalysisProjectOptions
 	{
 		Dictionary<string, RuleTreeNode> rules = new Dictionary<string, RuleTreeNode>();
 		
-		public AnalysisProjectOptions()
+		public old_AnalysisProjectOptions()
 		{
 			//
 			// The InitializeComponent() call is required for Windows Forms designer support.
@@ -286,9 +286,9 @@ namespace ICSharpCode.CodeAnalysis
 		
 		class ConfigBinding : ConfigurationGuiBinding
 		{
-			readonly AnalysisProjectOptions po;
+			readonly old_AnalysisProjectOptions po;
 			
-			public ConfigBinding(AnalysisProjectOptions po)
+			public ConfigBinding(old_AnalysisProjectOptions po)
 			{
 				this.po = po;
 				this.TreatPropertyValueAsLiteral = false;
diff --git a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptions.resx b/src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisProjectOptions.resx
similarity index 100%
rename from src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptions.resx
rename to src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisProjectOptions.resx