Merge "Revert "Remove netcfg's unused options.""