diff --git a/SConstruct b/SConstruct
index 9919eecb2e8..3d6287f9e6d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1179,10 +1179,7 @@ elif not onlyServer:
 
     coreShellFiles = [ "shell/dbshell.cpp" , "shell/shell_utils.cpp" , "shell/mongo-server.cpp" ]
 
-    if not windows:
-        coreShellFiles.append( "third_party/linenoise/linenoise.cpp" )
-    else:
-        coreShellFiles.append( "third_party/linenoise/linenoise_win32.cpp" )
+    coreShellFiles.append( "third_party/linenoise/linenoise.cpp" )
 
     shellEnv.Prepend( LIBPATH=[ "." ] )
         
diff --git a/shell/dbshell.cpp b/shell/dbshell.cpp
index 465560d2ead..3d880dbfc8a 100644
--- a/shell/dbshell.cpp
+++ b/shell/dbshell.cpp
@@ -50,7 +50,7 @@ bool autoKillOp = false;
 jmp_buf jbuf;
 #endif
 
-#if defined(USE_LINENOISE) && !defined(WIN32) && !defined(_WIN32) 
+#if defined(USE_LINENOISE)
 #define USE_TABCOMPLETION
 #endif