Making old code path to work as always
Making old code path to work as always

Emergensys/commandline,anthonylangsworth/commandline,anthonylangsworth/commandline,rmboggs/commandline,nausley/commandline,Thilas/commandline,nausley/commandline,Emergensys/commandline,Ehryk/commandline,Thilas/commandline,kshanafelt/commandline,Ehryk/commandline,kshanafelt/commandline,rmboggs/commandline,huoxudong125/commandline,huoxudong125/commandline