diff --git a/‎awscli/clidriver.py‎
Lines changed: 0 additions & 13 deletions b/‎awscli/clidriver.py‎
Lines changed: 0 additions & 13 deletions
diff --git a/‎tests/unit/test_clidriver.py‎
Lines changed: 0 additions & 2 deletions b/‎tests/unit/test_clidriver.py‎
Lines changed: 0 additions & 2 deletions
@@ -125,19 +125,6 @@ def _build_argument_table(self):
         cli_arguments = cli_data.get('options', None)
         for option in cli_arguments:
             option_params = copy_kwargs(cli_arguments[option])
-            # Special case the 'choices' param.  Allows choices
-            # to reference a variable from the session.
-            if 'choices' in option_params:
-                choices = option_params['choices']
-                if not isinstance(choices, list):
-                    # Assume it's a reference like
-                    # "{provider}/_foo", so first resolve
-                    # the provider.
-                    provider = self.session.get_config_variable('provider')
-                    # The grab the var from the session
-                    choices_path = choices.format(provider=provider)
-                    choices = list(self.session.get_data(choices_path))
-                option_params['choices'] = choices
             cli_argument = self._create_cli_argument(option, option_params)
             cli_argument.add_to_arg_table(argument_table)
         # Then the final step is to send out an event so handlers
 
@@ -82,8 +82,6 @@
             },
         }
     },
-    'aws/_services': {'s3':{}},
-    'aws/_regions': {},
 }
 
 GET_VARIABLE = {
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,6 @@`
`82`	`82`	`},`
`83`	`83`	`}`
`84`	`84`	`},`
`85`		`- 'aws/_services': {'s3':{}},`
`86`		`- 'aws/_regions': {},`
`87`	`85`	`}`
`88`	`86`
`89`	`87`	`GET_VARIABLE = {`