revert CMDLineParser to original version
add our changes to CMDLineParser