rollback arg parsing changes