Unbreak everything (CommandConnection)