fix(compat): burn down compat-matrix engine-leg debt root causes

fix(compat): burn down compat-matrix engine-leg debt root causes #2307