siffiejoe Revert "Fix off-by-one error in command line parsing"