diff --git a/src/Command/RemoteCommandProxy.php b/src/Command/RemoteCommandProxy.php
index c1dda6629d..aede9487f3 100644
--- a/src/Command/RemoteCommandProxy.php
+++ b/src/Command/RemoteCommandProxy.php
@@ -5,6 +5,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Drush\Symfony\IndiscriminateInputDefinition;
 
 use Drush\Preflight\RedispatchHook;
 
@@ -30,6 +31,9 @@ public function __construct($name, RedispatchHook $redispatchHook)
         parent::__construct($name);
         $this->redispatchHook = $redispatchHook;
 
+        // Put in a special input definition to avoid option validation errors.
+        $this->setDefinition(new IndiscriminateInputDefinition());
+
         // Put in a placeholder array arguement to avoid validation errors.
         $this->addArgument(
             'arguments',
diff --git a/src/Preflight/PreflightArgs.php b/src/Preflight/PreflightArgs.php
index 548ef232d1..cdf668d0cf 100644
--- a/src/Preflight/PreflightArgs.php
+++ b/src/Preflight/PreflightArgs.php
@@ -5,7 +5,7 @@
 use Consolidation\Config\ConfigInterface;
 
 use Symfony\Component\Console\Input\ArgvInput;
-use Drush\Preflight\LessStrictArgvInput;
+use Drush\Symfony\LessStrictArgvInput;
 
 /**
  * Storage for arguments preprocessed during preflight.
diff --git a/src/Symfony/IndiscriminateInputDefinition.php b/src/Symfony/IndiscriminateInputDefinition.php
new file mode 100644
index 0000000000..959c2d22e8
--- /dev/null
+++ b/src/Symfony/IndiscriminateInputDefinition.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Drush\Symfony;
+
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Exception\LogicException;
+
+/**
+ * This is an InputDefinition that allows any option to be considered valid.
+ * Used when passing a command through to anohter dispatcher that will do
+ * the option validation.
+ *
+ * We use this instead of a LessStrictArgvInput in cases where we do not
+ * know in advance whether the input should be handled indescriminately.
+ * In other words, an IndiscriminateInputDefinition is attached to individual
+ * Commands that should accept any option, whereas a LessStrictArgvInput
+ * should be used to make all command skip option validation.
+ */
+class IndiscriminateInputDefinition extends InputDefinition
+{
+    /**
+     * @inheritdoc
+     */
+    public function hasShortcut($name)
+    {
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function hasOption($name)
+    {
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOption($name)
+    {
+        if (parent::hasOption($name)) {
+            return parent::getOption($name);
+        }
+        return new InputOption($name, null, InputOption::VALUE_OPTIONAL, '', []);
+    }
+}
diff --git a/src/Preflight/LessStrictArgvInput.php b/src/Symfony/LessStrictArgvInput.php
similarity index 97%
rename from src/Preflight/LessStrictArgvInput.php
rename to src/Symfony/LessStrictArgvInput.php
index 403ee327ac..f04877f786 100644
--- a/src/Preflight/LessStrictArgvInput.php
+++ b/src/Symfony/LessStrictArgvInput.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drush\Preflight;
+namespace Drush\Symfony;
 
 use Symfony\Component\Console\Input\ArgvInput;
 
@@ -12,6 +12,11 @@
  *
  * If the last argument of the command being called is not an array
  * argument, then an error will be thrown if there are two many arguments.
+ *
+ * We use this instead of a IndiscriminateInputDefinition in cases where we
+ * know in advance that we wish to disable input validation for all commands.
+ * In contrast, an IndiscriminateInputDefinition is attached to individual
+ * Commands that should accept any option.
  */
 class LessStrictArgvInput extends ArgvInput
 {