diff --git a/src/chocolatey.install/chocolatey.en-us.wxl b/src/chocolatey.install/chocolatey.en-us.wxl
index 485b3db669..d2f18d85d4 100644
--- a/src/chocolatey.install/chocolatey.en-us.wxl
+++ b/src/chocolatey.install/chocolatey.en-us.wxl
@@ -4,6 +4,7 @@
     <String Id="NewerVersionInstalled" Overridable="yes">A newer version of Chocolatey is already installed.</String>
     <String Id="ProfileAdditionDescription" Overridable="yes">Add the Chocolatey Helpers to your PowerShell Profile to enable tab-completions.
 Defaults to adding to the AllUsersAllHosts profile.</String>
-    <String Id="RequiresDotNet48" Overridable="yes">This application requires .NET Framework 4.8. Please install the .NET Framework then run this installer again.</String>
-    <String Id="ToolsFolderDescription" Overridable="yes">Sets the location for the Tools Folder</String>
-</WixLocalization>
\ No newline at end of file
+    <String Id="RequiresDotNet48" Overridable="yes">Chocolatey CLI requires .NET Framework 4.8. Please install the .NET Framework then run this installer again.</String>
+    <String Id="UpgradeNotAllowed" Overridable="yes">The Chocolatey CLI MSI is intended for installation only. Please run 'choco upgrade chocolatey' from an elevated terminal window to upgrade.</String>
+    <String Id="ToolsFolderDescription" Overridable="yes">Sets the location for the Tools Folder.</String>
+</WixLocalization>
diff --git a/src/chocolatey.install/chocolatey.wxs b/src/chocolatey.install/chocolatey.wxs
index 68afd6cb67..5ea061104d 100644
--- a/src/chocolatey.install/chocolatey.wxs
+++ b/src/chocolatey.install/chocolatey.wxs
@@ -11,7 +11,7 @@
 
   <Product Name="$(var.ProductName)" Id="*" UpgradeCode="$(var.ProductCode)" Language="1033" Manufacturer="$(var.ProductVendor)" Codepage="1252" Version="$(var.ProductVersion)">
     <Package Id='*' Platform='x86' Keywords='Installer' Description="$(var.ProductName)" Comments="$(var.ProductSummary)" InstallScope="perMachine" InstallerVersion="200" Compressed="yes" />
-    <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="!(loc.NewerVersionInstalled)" />
+    <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="!(loc.NewerVersionInstalled)" Disallow="yes" DisallowUpgradeErrorMessage="!(loc.UpgradeNotAllowed)" />
     <Media Id="1" Cabinet="$(var.ArtifactName).cab" EmbedCab="yes" />
 
     <!-- Installation Properties -->
@@ -23,10 +23,6 @@
     <Property Id="ARPNOREPAIR" Value="yes" Secure="yes" />      <!-- Remove repair from post-install options, as it will not work with the script method -->
     <Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />      <!-- Remove modify from post-install options, as it will not work with the script method -->
 
-    <CustomAction Id="SetHelpersDirectoryPath" Property="HelpersDirectoryPath" Value="[INSTALLDIR]\\helpers" />
-    <CustomAction Id="SetRedirectsDirectoryPath" Property="RedirectsDirectoryPath" Value="[INSTALLDIR]\\redirects" />
-    <CustomAction Id="SetToolsDirectoryPath" Property="ToolsDirectoryPath" Value="[INSTALLDIR]\\tools" />
-
     <PropertyRef Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" />
     <Condition Message="!(loc.RequiresDotNet48)">
       <![CDATA[Installed OR WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED]]>
@@ -35,17 +31,13 @@
     <!-- Custom Actions to Install Chocolatey -->
     <SetProperty Id="InstallChocolatey"
       Before="InstallChocolatey"
-      Sequence="execute" 
+      Sequence="execute"
       Value="&quot;[SystemFolder]\WindowsPowerShell\v1.0\powershell.exe&quot; -NoProfile -ExecutionPolicy Bypass -Command &quot;$env:ChocolateyInstall='[INSTALLDIR]'; &amp; '[#ChocolateyInstall]' -ChocolateyDownloadUrl '[#ChocolateyNupkg]' -UseNativeUnzip&quot;" />
     <CustomAction Id="InstallChocolatey" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="yes" />
 
     <!-- Custom Additions to the InstallExecuteSequence (e.g. the actions above) -->
     <InstallExecuteSequence>
       <Custom Action="InstallChocolatey" After="InstallFiles"><![CDATA[NOT Installed]]></Custom>
-      <!-- Set these values during the uninstall such that we can remove the folders -->
-      <Custom Action="SetHelpersDirectoryPath" Before="CostInitialize"><![CDATA[Installed]]></Custom>
-      <Custom Action="SetRedirectsDirectoryPath" Before="CostInitialize"><![CDATA[Installed]]></Custom>
-      <Custom Action="SetToolsDirectoryPath" Before="CostInitialize"><![CDATA[Installed]]></Custom>
     </InstallExecuteSequence>
 
     <!-- Installation Layout - primarily 'temporary' install files, unlike most MSI installers, as we run the standard install script -->
@@ -54,14 +46,6 @@
         <Directory Id="INSTALLDIR" Name="chocolatey">
           <Component Id="ChocolateyInstallDirectory" Guid="{9E538CD6-6F07-43E5-B8E2-ED31995F3D1C}" Win64="no">
             <CreateFolder />
-            <RemoveFile Id="ChocoEXE" On="uninstall" Name="choco.exe" />
-            <RemoveFile Id="ChocoIgnore" On="uninstall" Name="choco.exe.ignore" />
-            <RemoveFile Id="ChocoManifest" On="uninstall" Name="choco.exe.manifest" />
-            <RemoveFile Id="ChocoCredits" On="uninstall" Name="CREDITS.txt" />
-            <RemoveFile Id="ChocoLicense" On="uninstall" Name="LICENSE.txt" />
-            <util:RemoveFolderEx Id="HelpersDirectory" On="uninstall" Property="HelpersDirectoryPath" />
-            <util:RemoveFolderEx Id="RedirectsDirectory" On="uninstall" Property="RedirectsDirectoryPath" />
-            <util:RemoveFolderEx Id="ToolsDirectory" On="uninstall" Property="ToolsDirectoryPath" />
             <Environment Id="ChocolateyInstallEnvVar" Action="set" Name="ChocolateyInstall" Permanent="no" System="yes" Value="[INSTALLDIR]" />
           </Component>
         </Directory>