diff --git a/src/load-commands.js b/src/load-commands.js
index f09ba8368..f6be472ac 100644
--- a/src/load-commands.js
+++ b/src/load-commands.js
@@ -2,25 +2,34 @@
 
 const isNode = !global.window
 
-function requireDir () {
+function requireCommands () {
   if (isNode) return require('require-dir')('./api')
 
-  // Webpack specific require of a directory
-  const req = require.context('./api', false, /\.js$/)
-
-  const files = {}
-  req.keys().forEach(key => {
-    const name = key
-      .replace(/^\.\//, '')
-      .replace(/\.js$/, '')
-    files[name] = req(key)
-  })
-
-  return files
+  return {
+    add: require('./api/add'),
+    block: require('./api/block'),
+    cat: require('./api/cat'),
+    commands: require('./api/commands'),
+    config: require('./api/config'),
+    dht: require('./api/dht'),
+    diag: require('./api/diag'),
+    id: require('./api/id'),
+    log: require('./api/log'),
+    ls: require('./api/ls'),
+    mount: require('./api/mount'),
+    name: require('./api/name'),
+    object: require('./api/object'),
+    pin: require('./api/pin'),
+    ping: require('./api/ping'),
+    refs: require('./api/refs'),
+    swarm: require('./api/swarm'),
+    update: require('./api/update'),
+    version: require('./api/version')
+  }
 }
 
 function loadCommands (send) {
-  const files = requireDir()
+  const files = requireCommands()
   const cmds = {}
 
   Object.keys(files).forEach(file => {