diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 347eedef29b..7206e5f17d9 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -654,7 +654,6 @@ def SAMBA_PLUGIN(bld, pluginname, source,
                  vars=None,
                  subdir=None,
                  realname=None,
-                 keep_underscore=False,
                  autoproto=None,
                  autoproto_extra_source='',
                  install_path=None,
@@ -686,7 +685,6 @@ def SAMBA_PLUGIN(bld, pluginname, source,
                       cflags=cflags,
                       ldflags=ldflags,
                       realname=realname,
-                      keep_underscore=keep_underscore,
                       autoproto=autoproto,
                       autoproto_extra_source=autoproto_extra_source,
                       local_include=local_include,
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 4e62bb4c946..4c5f708328b 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -36,7 +36,6 @@ bld.SAMBA_PLUGIN('nss_wrapper_winbind',
 
 if (Utils.unversioned_sys_platform() == 'linux' or (host_os.rfind('gnu') > -1)):
     bld.SAMBA_PLUGIN('nss_winbind',
-              keep_underscore=True,
               cflags='-D_PUBLIC_ON_LINUX_=_PUBLIC_',
               source='winbind_nss_linux.c',
               deps='wbclient',
@@ -45,7 +44,6 @@ if (Utils.unversioned_sys_platform() == 'linux' or (host_os.rfind('gnu') > -1)):
               vnum='2')
 
     bld.SAMBA3_PLUGIN('nss_wins',
-                      keep_underscore=True,
                       cflags='-D_PUBLIC_ON_LINUX_=_PUBLIC_',
                       source='wins.c',
                       deps='wbclient replace',