Revert "Fix layout related issues #737, #667, #704"

This reverts commit fb9a8af.

tmuxp/workspacebuilder.py

@@ -221,10 +221,6 @@ def build(self, session=None, append=False):
             assert self.sconf["session_name"] == session.name
             assert len(self.sconf["session_name"]) > 0
 
-        if has_gte_version("2.9"):
-            # Use tmux default session size, overwrite Server::new_session
-            session.set_option("default-size", DEFAULT_SIZE)
-
         self.session = session
         self.server = session.server
 
@@ -272,6 +268,9 @@ def build(self, session=None, append=False):
                 assert isinstance(p, Pane)
                 p = p
 
+                if "layout" in wconf:
+                    w.select_layout(wconf["layout"])
+
                 if "focus" in pconf and pconf["focus"]:
                     focus_pane = p
 
@@ -286,8 +285,6 @@ def build(self, session=None, append=False):
             if focus_pane:
                 focus_pane.select_pane()
 
-            w.select_layout(wconf.get("layout", "even-vertical"))
-
         if focus:
             focus.select_window()
 
@@ -428,6 +425,8 @@ def get_pane_shell():
                 )
 
             assert isinstance(p, Pane)
+            if "layout" in wconf:
+                w.select_layout(wconf["layout"])
 
             if "suppress_history" in pconf:
                 suppress = pconf["suppress_history"]