| Index: tools/cr/cr/commands/shell.py
 | 
| diff --git a/tools/cr/cr/commands/shell.py b/tools/cr/cr/commands/shell.py
 | 
| index 452ebb746064d91641b13ed4ce2c8fcf7c686b83..2cd338deb5e728f261defd27a2e6bf5a5c6ce1a6 100644
 | 
| --- a/tools/cr/cr/commands/shell.py
 | 
| +++ b/tools/cr/cr/commands/shell.py
 | 
| @@ -35,9 +35,9 @@ class ShellCommand(cr.Command):
 | 
|      self.ConsumeArgs(parser, 'the shell')
 | 
|      return parser
 | 
|  
 | 
| -  def Run(self, context):
 | 
| -    if context.remains:
 | 
| -      cr.Host.Shell(context, *context.remains)
 | 
| +  def Run(self):
 | 
| +    if cr.context.remains:
 | 
| +      cr.Host.Shell(*cr.context.remains)
 | 
|        return
 | 
|      # If we get here, we are trying to launch an interactive shell
 | 
|      shell = os.environ.get('SHELL', None)
 | 
| @@ -48,6 +48,6 @@ class ShellCommand(cr.Command):
 | 
|        with tempfile.NamedTemporaryFile() as rcfile:
 | 
|          rcfile.write('source ~/.bashrc\nPS1="'+ps1+'"')
 | 
|          rcfile.flush()
 | 
| -        cr.Host.Execute(context, shell, '--rcfile', rcfile.name)
 | 
| +        cr.Host.Execute(shell, '--rcfile', rcfile.name)
 | 
|      else:
 | 
| -      cr.Host.Execute(context, shell)
 | 
| +      cr.Host.Execute(shell)
 | 
| 
 |