urgent bugfix; partial revert of 3eebb17

argparse has broken the argument parsing. Falling back to argv.