diff --git a/atom/common/lib/init.coffee b/atom/common/lib/init.coffee
index c85fb65a958..e3896af8a88 100644
--- a/atom/common/lib/init.coffee
+++ b/atom/common/lib/init.coffee
@@ -6,7 +6,7 @@ process.atomBinding = (name) ->
   try
     process.binding "atom_#{process.type}_#{name}"
   catch e
-    process.binding "atom_common_#{name}" if e.message is 'No such module'
+    process.binding "atom_common_#{name}" if /No such module/.test e.message
 
 # Add common/api/lib to module search paths.
 globalPaths = Module.globalPaths
diff --git a/common.gypi b/common.gypi
index 6f3bc24aafe..a89977bf200 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1,7 +1,7 @@
 {
   'variables': {
     'clang': 0,
-    'node_module_version': 14,
+    'openssl_no_asm': 1,
     'conditions': [
       ['OS=="mac" or OS=="linux"', {
         'clang': 1,
@@ -101,10 +101,6 @@
         'include_dirs': [
           'vendor/brightray/vendor/download/libchromiumcontent/src/v8/include',
         ],
-        'defines': [
-          # Override NODE_MODULE_VERSION
-          'NODE_MODULE_VERSION=<(node_module_version)',
-        ],
       }],
       ['_target_name=="libuv"', {
         'conditions': [
diff --git a/package.json b/package.json
index f1095511d3c..13eab4ef77d 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   ],
 
   "devDependencies": {
-    "atom-package-manager": "0.93.0",
+    "atom-package-manager": "0.98.0",
     "coffee-script": "~1.7.1",
     "coffeelint": "~1.3.0"
   },
diff --git a/vendor/node b/vendor/node
index 9a477fc9219..a80a10c6a1f 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 9a477fc92198e9e7d3ffcc989f51a290d901c767
+Subproject commit a80a10c6a1f2c668d90eda4e2c9aab38e4dcd4a2