Reverting an internal refactoring.
Reverting an internal refactoring.

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