diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5559055c..718ec6ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Bug fixes
+
+- Recover 'exo api' command registration removed by mistake #782
+
 ## 1.90.0
 
 ### Features
diff --git a/cmd/x.go b/cmd/x.go
new file mode 100644
index 00000000..5e20c8fd
--- /dev/null
+++ b/cmd/x.go
@@ -0,0 +1,67 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	egoscale "github.com/exoscale/egoscale/v3"
+
+	"github.com/exoscale/cli/cmd/internal/x"
+	"github.com/exoscale/cli/pkg/account"
+	"github.com/exoscale/cli/pkg/globalstate"
+)
+
+var xCmd *cobra.Command
+
+func init() {
+	xCmd = x.InitCommand()
+	xCmd.Use = "x"
+	xCmd.Aliases = append(xCmd.Aliases, "api")
+	xCmd.Hidden = true
+	xCmd.Long = `Low-level Exoscale API calls -- don't use this unless you have to.
+
+These commands are automatically generated using openapi-cli-generator[1],
+input parameters can be supplied either via stdin or using Shorthands[2].
+
+[1]: https://github.com/exoscale/openapi-cli-generator
+[2]: https://github.com/exoscale/openapi-cli-generator/tree/master/shorthand
+`
+
+	// This code being executed very early, at this point some information is not ready
+	// to be used such as the account's configuration and some global variables, so we
+	// we use the subcommand pre-run hook to perform last second changes to the
+	// outgoing requests.
+	xCmd.PersistentPreRunE = func(cmd *cobra.Command, _ []string) error {
+		// If no value is provided for flag `--server`, infer the server URL from the current
+		// CLI profile's default zone (or explicit `--zone` flag if specified) and environment
+		// (or explicit `--environment` flag if speficied):
+		if server, _ := cmd.Flags().GetString("server"); server == "" {
+			zone := account.CurrentAccount.DefaultZone
+			if z, _ := cmd.Flags().GetString("zone"); z != "" {
+				zone = z
+			}
+
+			endpoint, err := globalstate.EgoscaleV3Client.GetZoneAPIEndpoint(GContext, egoscale.ZoneName(zone))
+			if err != nil {
+				return err
+			}
+
+			if err := cmd.Flags().Set("server", string(endpoint)); err != nil {
+				return err
+			}
+		}
+
+		x.SetClientUserAgent(fmt.Sprintf(
+			"Exoscale-CLI-X/%s (%s) %s",
+			globalstate.GitVersion,
+			globalstate.GitCommit,
+			//lint:ignore SA1019 we only read value so it is fine
+			egoscale.UserAgent, //nolint:staticcheck
+		))
+
+		return x.SetClientCredentials(account.CurrentAccount.Key, account.CurrentAccount.Secret)
+	}
+
+	RootCmd.AddCommand(xCmd)
+}