diff --git a/core/commands.json b/core/commands.json
index e4bc7f96..b544fc07 100644
--- a/core/commands.json
+++ b/core/commands.json
@@ -359,12 +359,6 @@
         "type": "integer",
         "optional": true
       },
-      {
-        "command": "TIMEOUT",
-        "name": "seconds",
-        "type": "double",
-        "optional": true
-      },
       {
         "command": "MATCH",
         "name": "pattern",
@@ -456,12 +450,6 @@
         "type": "integer",
         "optional": true
       },
-      {
-        "command": "TIMEOUT",
-        "name": "seconds",
-        "type": "double",
-        "optional": true
-      },
       {
         "command": "MATCH",
         "name": "pattern",
@@ -571,12 +559,6 @@
         "type": "integer",
         "optional": true
       },
-      {
-        "command": "TIMEOUT",
-        "name": "seconds",
-        "type": "double",
-        "optional": true
-      },
       {
         "command": "SPARSE",
         "name": "spread",
@@ -743,12 +725,6 @@
         "type": "integer",
         "optional": true
       },
-      {
-        "command": "TIMEOUT",
-        "name": "seconds",
-        "type": "double",
-        "optional": true
-      },
       {
         "command": "SPARSE",
         "name": "spread",
@@ -970,12 +946,6 @@
         "type": "integer",
         "optional": true
       },
-      {
-        "command": "TIMEOUT",
-        "name": "seconds",
-        "type": "double",
-        "optional": true
-      },
       {
         "command": "SPARSE",
         "name": "spread",
@@ -1330,12 +1300,22 @@
     "group": "connection"
   },
   "TIMEOUT": {
-    "summary": "Gets or sets the query timeout for the current connection.",
+    "summary": "Runs the following command with the timeout",
     "arguments": [
       {
         "name": "seconds",
         "optional": true,
         "type": "double"
+      },
+      {
+        "name": "COMMAND",
+        "type": "string"
+      },
+      {
+        "command": "arg",
+        "type": "string",
+        "multiple": true,
+        "optional": true
       }
     ],
     "group": "connection"
diff --git a/core/commands_gen.go b/core/commands_gen.go
index e55c2850..5000cc4d 100644
--- a/core/commands_gen.go
+++ b/core/commands_gen.go
@@ -525,12 +525,6 @@ var commandsJSON = `{
         "type": "integer",
         "optional": true
       },
-      {
-        "command": "TIMEOUT",
-        "name": "seconds",
-        "type": "double",
-        "optional": true
-      },
       {
         "command": "MATCH",
         "name": "pattern",
@@ -622,12 +616,6 @@ var commandsJSON = `{
         "type": "integer",
         "optional": true
       },
-      {
-        "command": "TIMEOUT",
-        "name": "seconds",
-        "type": "double",
-        "optional": true
-      },
       {
         "command": "MATCH",
         "name": "pattern",
@@ -737,12 +725,6 @@ var commandsJSON = `{
         "type": "integer",
         "optional": true
       },
-      {
-        "command": "TIMEOUT",
-        "name": "seconds",
-        "type": "double",
-        "optional": true
-      },
       {
         "command": "SPARSE",
         "name": "spread",
@@ -909,12 +891,6 @@ var commandsJSON = `{
         "type": "integer",
         "optional": true
       },
-      {
-        "command": "TIMEOUT",
-        "name": "seconds",
-        "type": "double",
-        "optional": true
-      },
       {
         "command": "SPARSE",
         "name": "spread",
@@ -1136,12 +1112,6 @@ var commandsJSON = `{
         "type": "integer",
         "optional": true
       },
-      {
-        "command": "TIMEOUT",
-        "name": "seconds",
-        "type": "double",
-        "optional": true
-      },
       {
         "command": "SPARSE",
         "name": "spread",
@@ -1496,12 +1466,22 @@ var commandsJSON = `{
     "group": "connection"
   },
   "TIMEOUT": {
-    "summary": "Gets or sets the query timeout for the current connection.",
+    "summary": "Runs the following command with the timeout",
     "arguments": [
       {
         "name": "seconds",
         "optional": true,
         "type": "double"
+      },
+      {
+        "name": "COMMAND",
+        "type": "string"
+      },
+      {
+        "command": "arg",
+        "type": "string",
+        "multiple": true,
+        "optional": true
       }
     ],
     "group": "connection"