diff --git a/src/Lean/Elab/Tactic/Omega/Frontend.lean b/src/Lean/Elab/Tactic/Omega/Frontend.lean
index e7471ba7dc..19ed2e0e03 100644
--- a/src/Lean/Elab/Tactic/Omega/Frontend.lean
+++ b/src/Lean/Elab/Tactic/Omega/Frontend.lean
@@ -696,11 +696,11 @@ the tactic call `aesop (add 50% tactic Lean.Omega.omegaDefault)`. -/
 def omegaDefault : TacticM Unit := omegaTactic {}
 
 @[builtin_tactic Lean.Parser.Tactic.omega]
-def evalOmega : Tactic := fun
-  | `(tactic| omega $[$cfg]?) => do
-    let cfg ← elabOmegaConfig (mkOptionalNode cfg)
+def evalOmega : Tactic := fun stx => do
+--  | `(tactic| omega $[$cfg]?) => do
+    let cfg ← elabOmegaConfig stx[1]
     omegaTactic cfg
-  | _ => throwUnsupportedSyntax
+--  | _ => throwUnsupportedSyntax
 
 builtin_initialize bvOmegaSimpExtension : SimpExtension ←
   registerSimpAttr `bv_toNat
diff --git a/src/Lean/Elab/Tactic/SolveByElim.lean b/src/Lean/Elab/Tactic/SolveByElim.lean
index d8aeec7678..bb3b31d032 100644
--- a/src/Lean/Elab/Tactic/SolveByElim.lean
+++ b/src/Lean/Elab/Tactic/SolveByElim.lean
@@ -95,19 +95,24 @@ def evalApplyRules : Tactic := fun stx =>
   | _ => throwUnsupportedSyntax
 
 @[builtin_tactic Lean.Parser.Tactic.solveByElim]
-def evalSolveByElim : Tactic := fun stx =>
-  match stx with
-  | `(tactic| solve_by_elim $[*%$s]? $(cfg)? $[only%$o]? $[$t:args]? $[$use:using_]?) => do
+def evalSolveByElim : Tactic := fun stx => do
+--  match stx with
+--  | `(tactic| solve_by_elim $[*%$s]? $(cfg)? $[only%$o]? $[$t:args]? $[$use:using_]?) => do
+    let s := stx[1].getOptional?
+    let cfg := stx[2]
+    let o := stx[3].getOptional?
+    let t := stx[4].getOptional?.map TSyntax.mk
+    let use := stx[5].getOptional?.map TSyntax.mk
     let (star, add, remove) := parseArgs t
     let use := parseUsing use
     let goals ← if s.isSome then
       getGoals
     else
       pure [← getMainGoal]
-    let cfg ← elabConfig (mkOptionalNode cfg)
+    let cfg ← elabConfig cfg
     let [] ← processSyntax cfg o.isSome star add remove use goals |
       throwError "solve_by_elim unexpectedly returned subgoals"
     pure ()
-  | _ => throwUnsupportedSyntax
+--  | _ => throwUnsupportedSyntax
 
 end Lean.Elab.Tactic.SolveByElim