Old arg parsing rollback