- Restore argc and argv support