diff --git a/src/library_nodefs.js b/src/library_nodefs.js
index f3befde6e8b1d..289f9cf21ad3e 100644
--- a/src/library_nodefs.js
+++ b/src/library_nodefs.js
@@ -6,7 +6,7 @@
 
 mergeInto(LibraryManager.library, {
   $NODEFS__deps: ['$FS', '$PATH', '$ERRNO_CODES', '$mmapAlloc'],
-  $NODEFS__postset: 'if (ENVIRONMENT_IS_NODE) { requireNodeFS(); NODEFS.staticInit(); }',
+  $NODEFS__postset: 'if (ENVIRONMENT_IS_NODE) { NODEFS.staticInit(); }',
   $NODEFS: {
     isWindows: false,
     staticInit: () => {
diff --git a/src/node_shell_read.js b/src/node_shell_read.js
index c99805f0ba676..c47176de3cbbf 100644
--- a/src/node_shell_read.js
+++ b/src/node_shell_read.js
@@ -4,18 +4,9 @@
  * SPDX-License-Identifier: MIT
  */
 
-var fs;
-var nodePath;
-
-var requireNodeFS = () => {
-  // Use nodePath as the indicator for these not being initialized,
-  // since in some environments a global fs may have already been
-  // created.
-  if (!nodePath) {
-    fs = require('fs');
-    nodePath = require('path');
-  }
-};
+// These modules will usually be used on Node.js.
+var fs = require('fs');
+var nodePath = require('path');
 
 read_ = (filename, binary) => {
 #if SUPPORT_BASE64_EMBEDDING
@@ -24,7 +15,6 @@ read_ = (filename, binary) => {
     return binary ? ret : ret.toString();
   }
 #endif
-  requireNodeFS();
   filename = nodePath['normalize'](filename);
   return fs.readFileSync(filename, binary ? undefined : 'utf8');
 };
@@ -47,7 +37,6 @@ readAsync = (filename, onload, onerror) => {
     onload(ret);
   }
 #endif
-  requireNodeFS();
   filename = nodePath['normalize'](filename);
   fs.readFile(filename, function(err, data) {
     if (err) onerror(err);
diff --git a/src/preamble.js b/src/preamble.js
index 6cd66589a1c19..3cf7c26d97894 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -771,7 +771,6 @@ function instantiateSync(file, info) {
       // to load ok, but we do actually recompile the binary every time).
       var cachedCodeFile = '{{{ WASM_BINARY_FILE }}}.' + v8.cachedDataVersionTag() + '.cached';
       cachedCodeFile = locateFile(cachedCodeFile);
-      requireNodeFS();
       var hasCached = fs.existsSync(cachedCodeFile);
       if (hasCached) {
 #if RUNTIME_LOGGING
diff --git a/src/shell.js b/src/shell.js
index b67562899d1cc..e704a829e1914 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -258,7 +258,6 @@ if (ENVIRONMENT_IS_NODE) {
 #if WASM == 2
   // If target shell does not support Wasm, load the JS version of the code.
   if (typeof WebAssembly == 'undefined') {
-    requireNodeFS();
     eval(fs.readFileSync(locateFile('{{{ TARGET_BASENAME }}}.wasm.js'))+'');
   }
 #endif
@@ -423,7 +422,6 @@ if (ENVIRONMENT_IS_NODE) {
 var defaultPrint = console.log.bind(console);
 var defaultPrintErr = console.warn.bind(console);
 if (ENVIRONMENT_IS_NODE) {
-  requireNodeFS();
   defaultPrint = (str) => fs.writeSync(1, str + '\n');
   defaultPrintErr = (str) => fs.writeSync(2, str + '\n');
 }
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.jssize b/test/other/metadce/test_metadce_cxx_ctors1.jssize
index d0dfaceea36e3..cba3d8fd45ca4 100644
--- a/test/other/metadce/test_metadce_cxx_ctors1.jssize
+++ b/test/other/metadce/test_metadce_cxx_ctors1.jssize
@@ -1 +1 @@
-25955
+25925
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.jssize b/test/other/metadce/test_metadce_cxx_ctors2.jssize
index 9afc428a72117..0d30a875fe455 100644
--- a/test/other/metadce/test_metadce_cxx_ctors2.jssize
+++ b/test/other/metadce/test_metadce_cxx_ctors2.jssize
@@ -1 +1 @@
-25919
+25889
diff --git a/test/other/metadce/test_metadce_cxx_except.jssize b/test/other/metadce/test_metadce_cxx_except.jssize
index 15725c1c959ad..83eaad6a3e8d1 100644
--- a/test/other/metadce/test_metadce_cxx_except.jssize
+++ b/test/other/metadce/test_metadce_cxx_except.jssize
@@ -1 +1 @@
-31454
+31422
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.jssize b/test/other/metadce/test_metadce_cxx_except_wasm.jssize
index cf6ac79ca1b2f..e7b33c088de37 100644
--- a/test/other/metadce/test_metadce_cxx_except_wasm.jssize
+++ b/test/other/metadce/test_metadce_cxx_except_wasm.jssize
@@ -1 +1 @@
-26109
+26079
diff --git a/test/other/metadce/test_metadce_cxx_mangle.jssize b/test/other/metadce/test_metadce_cxx_mangle.jssize
index 7237e377efc7c..234cca735fd1a 100644
--- a/test/other/metadce/test_metadce_cxx_mangle.jssize
+++ b/test/other/metadce/test_metadce_cxx_mangle.jssize
@@ -1 +1 @@
-31553
+31521
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.jssize b/test/other/metadce/test_metadce_cxx_noexcept.jssize
index d0dfaceea36e3..cba3d8fd45ca4 100644
--- a/test/other/metadce/test_metadce_cxx_noexcept.jssize
+++ b/test/other/metadce/test_metadce_cxx_noexcept.jssize
@@ -1 +1 @@
-25955
+25925
diff --git a/test/other/metadce/test_metadce_hello_O0.jssize b/test/other/metadce/test_metadce_hello_O0.jssize
index 5a83e94204ad0..973abb4816852 100644
--- a/test/other/metadce/test_metadce_hello_O0.jssize
+++ b/test/other/metadce/test_metadce_hello_O0.jssize
@@ -1 +1 @@
-26205
+26149
diff --git a/test/other/metadce/test_metadce_hello_O1.jssize b/test/other/metadce/test_metadce_hello_O1.jssize
index ac7be745187c7..0853b45cd8959 100644
--- a/test/other/metadce/test_metadce_hello_O1.jssize
+++ b/test/other/metadce/test_metadce_hello_O1.jssize
@@ -1 +1 @@
-9145
+9089
diff --git a/test/other/metadce/test_metadce_hello_O2.jssize b/test/other/metadce/test_metadce_hello_O2.jssize
index b0b20f1984459..ae7ad4aca8490 100644
--- a/test/other/metadce/test_metadce_hello_O2.jssize
+++ b/test/other/metadce/test_metadce_hello_O2.jssize
@@ -1 +1 @@
-6539
+6511
diff --git a/test/other/metadce/test_metadce_hello_O3.jssize b/test/other/metadce/test_metadce_hello_O3.jssize
index 86278f6f2c228..fbc4ca6582b9c 100644
--- a/test/other/metadce/test_metadce_hello_O3.jssize
+++ b/test/other/metadce/test_metadce_hello_O3.jssize
@@ -1 +1 @@
-5989
+5961
diff --git a/test/other/metadce/test_metadce_hello_Os.jssize b/test/other/metadce/test_metadce_hello_Os.jssize
index 86278f6f2c228..fbc4ca6582b9c 100644
--- a/test/other/metadce/test_metadce_hello_Os.jssize
+++ b/test/other/metadce/test_metadce_hello_Os.jssize
@@ -1 +1 @@
-5989
+5961
diff --git a/test/other/metadce/test_metadce_hello_Oz.jssize b/test/other/metadce/test_metadce_hello_Oz.jssize
index 6ce706c91ea32..b5c939ef9cbec 100644
--- a/test/other/metadce/test_metadce_hello_Oz.jssize
+++ b/test/other/metadce/test_metadce_hello_Oz.jssize
@@ -1 +1 @@
-5948
+5920
diff --git a/test/other/metadce/test_metadce_hello_export_nothing.jssize b/test/other/metadce/test_metadce_hello_export_nothing.jssize
index ed3cdf9c33112..3f4f4b891ccee 100644
--- a/test/other/metadce/test_metadce_hello_export_nothing.jssize
+++ b/test/other/metadce/test_metadce_hello_export_nothing.jssize
@@ -1 +1 @@
-4667
+4641
diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize b/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize
index 75f2c8da44d47..2874bd57eeefd 100644
--- a/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize
+++ b/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize
@@ -1 +1 @@
-5259
+5234
diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize
index 76bc56dcd388e..c643cc8893238 100644
--- a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize
+++ b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize
@@ -1 +1 @@
-5258
+5233
diff --git a/test/other/metadce/test_metadce_mem_O3.jssize b/test/other/metadce/test_metadce_mem_O3.jssize
index 06e102d5685af..a24e1ffb762f6 100644
--- a/test/other/metadce/test_metadce_mem_O3.jssize
+++ b/test/other/metadce/test_metadce_mem_O3.jssize
@@ -1 +1 @@
-6150
+6122
diff --git a/test/other/metadce/test_metadce_mem_O3_grow.jssize b/test/other/metadce/test_metadce_mem_O3_grow.jssize
index 93884a9b59734..918dc7d7ea1a9 100644
--- a/test/other/metadce/test_metadce_mem_O3_grow.jssize
+++ b/test/other/metadce/test_metadce_mem_O3_grow.jssize
@@ -1 +1 @@
-6481
+6453
diff --git a/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize b/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize
index fb2be364c56de..40c2bafb5e42e 100644
--- a/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize
+++ b/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize
@@ -1 +1 @@
-5754
+5727
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone.jssize b/test/other/metadce/test_metadce_mem_O3_standalone.jssize
index 9c9ddc2cc36ec..dacfd57dae18f 100644
--- a/test/other/metadce/test_metadce_mem_O3_standalone.jssize
+++ b/test/other/metadce/test_metadce_mem_O3_standalone.jssize
@@ -1 +1 @@
-5678
+5651
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize
index 6d54d75067602..21ad3efd9a5a3 100644
--- a/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize
+++ b/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize
@@ -1 +1 @@
-5260
+5235
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize
index 76bc56dcd388e..c643cc8893238 100644
--- a/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize
+++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize
@@ -1 +1 @@
-5258
+5233
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize
index 76bc56dcd388e..c643cc8893238 100644
--- a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize
+++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize
@@ -1 +1 @@
-5258
+5233
diff --git a/test/other/metadce/test_metadce_minimal_O0.jssize b/test/other/metadce/test_metadce_minimal_O0.jssize
index 454310f5c5f77..1e5a1abdfe47c 100644
--- a/test/other/metadce/test_metadce_minimal_O0.jssize
+++ b/test/other/metadce/test_metadce_minimal_O0.jssize
@@ -1 +1 @@
-22908
+22852
diff --git a/test/other/metadce/test_metadce_minimal_O1.jssize b/test/other/metadce/test_metadce_minimal_O1.jssize
index 7a1ac55b4461f..ffc5531867cd6 100644
--- a/test/other/metadce/test_metadce_minimal_O1.jssize
+++ b/test/other/metadce/test_metadce_minimal_O1.jssize
@@ -1 +1 @@
-5660
+5607
diff --git a/test/other/metadce/test_metadce_minimal_O2.jssize b/test/other/metadce/test_metadce_minimal_O2.jssize
index bce5ffdd8fabd..14438ad1c4fca 100644
--- a/test/other/metadce/test_metadce_minimal_O2.jssize
+++ b/test/other/metadce/test_metadce_minimal_O2.jssize
@@ -1 +1 @@
-4374
+4348
diff --git a/test/other/metadce/test_metadce_minimal_O3.jssize b/test/other/metadce/test_metadce_minimal_O3.jssize
index 0bc0e514bf4a4..2b75a312c84f9 100644
--- a/test/other/metadce/test_metadce_minimal_O3.jssize
+++ b/test/other/metadce/test_metadce_minimal_O3.jssize
@@ -1 +1 @@
-3883
+3857
diff --git a/test/other/metadce/test_metadce_minimal_Os.jssize b/test/other/metadce/test_metadce_minimal_Os.jssize
index 0bc0e514bf4a4..2b75a312c84f9 100644
--- a/test/other/metadce/test_metadce_minimal_Os.jssize
+++ b/test/other/metadce/test_metadce_minimal_Os.jssize
@@ -1 +1 @@
-3883
+3857
diff --git a/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize b/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize
index 791d82540e015..f708db772289d 100644
--- a/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize
+++ b/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize
@@ -1 +1 @@
-3772
+3746
diff --git a/test/other/metadce/test_metadce_minimal_Oz.jssize b/test/other/metadce/test_metadce_minimal_Oz.jssize
index 0bc0e514bf4a4..2b75a312c84f9 100644
--- a/test/other/metadce/test_metadce_minimal_Oz.jssize
+++ b/test/other/metadce/test_metadce_minimal_Oz.jssize
@@ -1 +1 @@
-3883
+3857
diff --git a/test/other/metadce/test_metadce_minimal_pthreads.jssize b/test/other/metadce/test_metadce_minimal_pthreads.jssize
index 064f584f6e706..94c6318a41817 100644
--- a/test/other/metadce/test_metadce_minimal_pthreads.jssize
+++ b/test/other/metadce/test_metadce_minimal_pthreads.jssize
@@ -1 +1 @@
-15790
+15756
diff --git a/test/other/metadce/test_metadce_minimal_pthreads.size b/test/other/metadce/test_metadce_minimal_pthreads.size
index 36c737255a71b..bc1eb7ef6c56f 100644
--- a/test/other/metadce/test_metadce_minimal_pthreads.size
+++ b/test/other/metadce/test_metadce_minimal_pthreads.size
@@ -1 +1 @@
-18307
+18301
diff --git a/test/other/test_unoptimized_code_size.js.size b/test/other/test_unoptimized_code_size.js.size
index bf4fb4a2d2c65..02ffca46af798 100644
--- a/test/other/test_unoptimized_code_size.js.size
+++ b/test/other/test_unoptimized_code_size.js.size
@@ -1 +1 @@
-67175
+66962
diff --git a/test/other/test_unoptimized_code_size_no_asserts.js.size b/test/other/test_unoptimized_code_size_no_asserts.js.size
index 6147842a9e1c3..f33fd5b9f6b86 100644
--- a/test/other/test_unoptimized_code_size_no_asserts.js.size
+++ b/test/other/test_unoptimized_code_size_no_asserts.js.size
@@ -1 +1 @@
-39976
+39763
diff --git a/test/other/test_unoptimized_code_size_strict.js.size b/test/other/test_unoptimized_code_size_strict.js.size
index 7fe4390f212da..ec7a069233c1a 100644
--- a/test/other/test_unoptimized_code_size_strict.js.size
+++ b/test/other/test_unoptimized_code_size_strict.js.size
@@ -1 +1 @@
-66041
+65828