diff --git a/src/package-manager.coffee b/src/package-manager.coffee
index 8527188d3..1692d477a 100644
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
@@ -303,6 +303,9 @@ class PackageManager
     # of the first package isn't skewed by being the first to require atom
     require '../exports/atom'
 
+    # TODO: remove after a few atom versions.
+    @uninstallAutocompletePlus()
+
     packagePaths = @getAvailablePackagePaths()
     packagePaths = packagePaths.filter (packagePath) => not @isPackageDisabled(path.basename(packagePath))
     packagePaths = _.uniq packagePaths, (packagePath) -> path.basename(packagePath)
@@ -409,6 +412,18 @@ class PackageManager
     message = "Failed to load the #{path.basename(packagePath)} package"
     atom.notifications.addError(message, {stack, detail, dismissable: true})
 
+  # TODO: remove these autocomplete-plus specific helpers after a few versions.
+  uninstallAutocompletePlus: ->
+    packageDir = null
+    devDir = path.join("dev", "packages")
+    for packageDirPath in @packageDirPaths
+      packageDir = packageDirPath if not packageDirPath.endsWith(devDir)
+
+    if packageDir?
+      autocompletePlusPath = path.join(packageDir, 'autocomplete-plus')
+      fs.isDirectory autocompletePlusPath, (isDir, error) ->
+        fs.unlink(autocompletePlusPath) if isDir
+
 if Grim.includeDeprecatedAPIs
   EmitterMixin = require('emissary').Emitter
   EmitterMixin.includeInto(PackageManager)