diff --git a/subiquity/server/server.py b/subiquity/server/server.py
index 25ac1356..a2c79c92 100644
--- a/subiquity/server/server.py
+++ b/subiquity/server/server.py
@@ -123,7 +123,7 @@ class MetaController:
             self.app.controllers.Source.configured()
         else:
             self.app.base_model.set_source_variant(variant)
-        self.app.variant = variant
+        self.app.set_source_variant(variant)
 
     async def client_variant_GET(self) -> str:
         return self.app.variant
diff --git a/system_setup/client/client.py b/system_setup/client/client.py
index d04dc2da..05c33d05 100644
--- a/system_setup/client/client.py
+++ b/system_setup/client/client.py
@@ -15,7 +15,6 @@
 
 import logging
 import sys
-import os
 
 from subiquity.client.client import SubiquityClient
 
@@ -47,33 +46,3 @@ class SystemSetupClient(SubiquityClient):
             "Summary",
         ]
     }
-
-    def restart(self, remove_last_screen=True, restart_server=False):
-        log.debug(f"restart {remove_last_screen} {restart_server}")
-        if self.fg_proc is not None:
-            log.debug(
-                "killing foreground process %s before restarting",
-                self.fg_proc)
-            self.restarting = True
-            self.aio_loop.create_task(
-                self._kill_fg_proc(remove_last_screen, restart_server))
-            return
-        if remove_last_screen:
-            self._remove_last_screen()
-        if restart_server:
-            self.restarting = True
-            self.ui.block_input = True
-            self.aio_loop.create_task(self._restart_server())
-            return
-        if self.urwid_loop is not None:
-            self.urwid_loop.stop()
-        cmdline = sys.argv
-        if self.opts.dry_run:
-            cmdline = [
-                sys.executable, '-m', 'system_setup.cmd.tui',
-                ] + sys.argv[1:] + ['--socket', self.opts.socket]
-            if self.opts.server_pid is not None:
-                cmdline.extend(['--server-pid', self.opts.server_pid])
-            log.debug("restarting %r", cmdline)
-
-        os.execvp(cmdline[0], cmdline)