diff -Naur a/script/build b/script/build
--- a/script/build	2017-02-17 10:53:06.000000000 -0600
+++ b/script/build	2017-02-22 23:35:29.241396450 -0600
@@ -23,7 +23,6 @@
   .wrap(yargs.terminalWidth())
   .argv
 
-const checkChromedriverVersion = require('./lib/check-chromedriver-version')
 const cleanOutputDirectory = require('./lib/clean-output-directory')
 const codeSignOnMac = require('./lib/code-sign-on-mac')
 const compressArtifacts = require('./lib/compress-artifacts')
@@ -48,7 +47,6 @@
   process.exit(1)
 })
 
-checkChromedriverVersion()
 cleanOutputDirectory()
 copyAssets()
 transpileBabelPaths()
@@ -60,46 +58,3 @@
 generateMetadata()
 generateAPIDocs()
 dumpSymbols()
-  .then(packageApplication)
-  .then(packagedAppPath => {
-    if (process.platform === 'darwin') {
-      if (argv.codeSign) {
-        codeSignOnMac(packagedAppPath)
-      } else {
-        console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
-      }
-    } else if (process.platform === 'win32') {
-      if (argv.createWindowsInstaller) {
-        return createWindowsInstaller(packagedAppPath, argv.codeSign).then(() => packagedAppPath)
-      }
-      else {
-        console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer. Code-signing was skipped too.'.gray)
-      }
-    } else if (process.platform === 'linux') {
-      if (argv.createDebianPackage) {
-        createDebianPackage(packagedAppPath)
-      } else {
-        console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray)
-      }
-
-      if (argv.createRpmPackage) {
-        createRpmPackage(packagedAppPath)
-      } else {
-        console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray)
-      }
-    }
-
-    return Promise.resolve(packagedAppPath)
-  }).then(packagedAppPath => {
-    if (argv.compressArtifacts) {
-      compressArtifacts(packagedAppPath)
-    } else {
-      console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray)
-    }
-
-    if (argv.install) {
-      installApplication(packagedAppPath)
-    } else {
-      console.log('Skipping installation. Specify the --install option to install Atom'.gray)
-    }
-  })
diff -Naur a/script/package.json b/script/package.json
--- a/script/package.json	2017-02-17 10:53:06.000000000 -0600
+++ b/script/package.json	2017-02-22 23:36:47.888097996 -0600
@@ -8,7 +8,6 @@
     "colors": "1.1.2",
     "csslint": "1.0.2",
     "donna": "1.0.13",
-    "electron-chromedriver": "~1.3",
     "electron-packager": "7.3.0",
     "electron-winstaller": "2.5.1",
     "fs-extra": "0.30.0",
diff -Naur a/src/main-process/atom-application.coffee b/src/main-process/atom-application.coffee
--- a/src/main-process/atom-application.coffee	2017-02-17 10:53:06.000000000 -0600
+++ b/src/main-process/atom-application.coffee	2017-02-22 23:33:19.542590377 -0600
@@ -797,7 +797,7 @@
       @restart()
 
   restart: ->
-    args = []
+    args = ["--app=/usr/share/atom"]
     args.push("--safe") if @safeMode
     args.push("--log-file=#{@logFile}") if @logFile?
     args.push("--socket-path=#{@socketPath}") if @socketPath?
diff -Naur a/src/package-manager.coffee b/src/package-manager.coffee
--- a/src/package-manager.coffee	2017-02-17 10:53:06.000000000 -0600
+++ b/src/package-manager.coffee	2017-02-25 02:23:32.459106058 -0600
@@ -145,7 +145,7 @@
     apmRoot = path.join(process.resourcesPath, 'app', 'apm')
     @apmPath = path.join(apmRoot, 'bin', commandName)
     unless fs.isFileSync(@apmPath)
-      @apmPath = path.join(apmRoot, 'node_modules', 'atom-package-manager', 'bin', commandName)
+      @apmPath = path.join('/usr/share/atom/resources/app/apm', 'node_modules', 'atom-package-manager', 'bin', commandName)
     @apmPath
 
   # Public: Get the paths being used to look for packages.