Reverting to unmodified tclap