diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in
index df719af26ca..9757eb7ceb4 100644
--- a/dlls/userenv/Makefile.in
+++ b/dlls/userenv/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = userenv.dll
 IMPORTS   = advapi32
 IMPORTLIB = userenv
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	userenv_main.c
diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c
index 58e610f6c6e..87ace7d5c11 100644
--- a/dlls/userenv/userenv_main.c
+++ b/dlls/userenv/userenv_main.c
@@ -35,21 +35,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL( userenv );
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("%p %d %p\n", hinstDLL, fdwReason, lpvReserved);
-
-    switch (fdwReason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls(hinstDLL);
-        break;
-    }
-    return TRUE;
-}
-
 static BOOL get_reg_value(WCHAR *env, HKEY hkey, const WCHAR *name, WCHAR *val, DWORD size)
 {
     DWORD type, res_size=0;