Index: Core/Common/src/Core.Common.Utils/SettingsHelper.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rcf9f4bc1ec5867b36a9c8c8a6057f759bc18382e
--- Core/Common/src/Core.Common.Utils/SettingsHelper.cs	(.../SettingsHelper.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Utils/SettingsHelper.cs	(.../SettingsHelper.cs)	(revision cf9f4bc1ec5867b36a9c8c8a6057f759bc18382e)
@@ -16,16 +16,10 @@
             ApplicationCompany = info.Company;
         }
 
-        public static string ApplicationNameAndVersion
-        {
-            get
-            {
-                return ApplicationName + " " + ApplicationVersion;
-            }
-        }
-
         public static string ApplicationName { get; private set; }
+
         public static string ApplicationVersion { get; private set; }
+
         public static string ApplicationCompany { get; private set; }
 
         public static string GetApplicationLocalUserSettingsDirectory()
@@ -35,7 +29,7 @@
             var assemblyInfo = AssemblyUtils.GetAssemblyInfo(executingAssembly);
             var companySettingsDirectoryPath = Path.Combine(localSettingsDirectoryPath, assemblyInfo.Company);
 
-            var appSettingsDirectoryPath = Path.Combine(companySettingsDirectoryPath, GetApplicationLocalUserSettingsDirectoryName());
+            var appSettingsDirectoryPath = Path.Combine(companySettingsDirectoryPath, ApplicationName + " " + ApplicationVersion);
 
             if (!Directory.Exists(appSettingsDirectoryPath))
             {
@@ -44,22 +38,5 @@
 
             return appSettingsDirectoryPath;
         }
-
-        private static string GetApplicationLocalUserSettingsDirectoryName()
-        {
-            var executingAssembly = Assembly.GetExecutingAssembly();
-            var applicationVersionDirectory = ApplicationName + "-" + ApplicationVersion;
-
-            // For debug versions, and releases ran from the zip, the ApplicationName & Version are not unique 
-            // for different versions. As a result Mono.Addins tries to mix dlls from different installations,
-            // either corrupting DeltaShell or loading plugins not in the installation being ran. To prevent all
-            // this, we add a hash for the current installation directory to make sure the local settings folder 
-            // is still unique.
-
-            var uniqueInstallationHash = Path.GetFullPath(executingAssembly.Location).GetHashCode();
-            applicationVersionDirectory += "_#" + Math.Abs(uniqueInstallationHash);
-
-            return applicationVersionDirectory;
-        }
     }
 }
\ No newline at end of file
Index: lib/Mono.Addins.CecilReflector.dll
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rcf9f4bc1ec5867b36a9c8c8a6057f759bc18382e
Binary files differ
Index: lib/Mono.Addins.dll
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rcf9f4bc1ec5867b36a9c8c8a6057f759bc18382e
Binary files differ