[f16ref] Switch Gbox 2.1/2.2 back to extend cmdline