diff --git a/build.sh b/build.sh
index b85e254c15d1d4672c366e12cbc85928793e2e7c..efe96a0a6ac5f77c4863540a1ee6761b464ca42f 100755
--- a/build.sh
+++ b/build.sh
@@ -120,7 +120,6 @@ pre_build()
 
     "$autobuild" configure --quiet -c $variant -- \
      -DPACKAGE:BOOL=ON \
-     -DUNATTENDED:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
      -DVIEWER_CHANNEL:STRING="${viewer_channel}" \
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index bd69c4985644a8e5d4e642341f9b01f5f8c49c5d..b913d6398e632ee46c544362dc842b4c3bf2e668 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -209,7 +209,6 @@ set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if
 
 set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
 set(USESYSTEMLIBS OFF CACHE BOOL "Use libraries from your system rather than Linden-supplied prebuilt libraries.")
-set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express editions.")
 
 set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.")
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index cf275ef4b56749d67f813f7f771c4d3bec3cf20f..6b3db36efec2b072cb385712c16ce1abd084312f 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1853,23 +1853,21 @@ if (WINDOWS)
 
     add_dependencies(${VIEWER_BINARY_NAME}
       SLPlugin
-   windows-crash-logger
+      windows-crash-logger
     )
 
     # sets the 'working directory' for debugging from visual studio.
-    if (NOT UNATTENDED)
-        add_custom_command(
-            TARGET ${VIEWER_BINARY_NAME} POST_BUILD
-            COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
-            ARGS
-              --solution
-              ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
-              --workingdir
-              ${VIEWER_BINARY_NAME}
-              "${CMAKE_CURRENT_SOURCE_DIR}"
-            COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
-            )
-    endif (NOT UNATTENDED)
+    add_custom_command(
+        TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+        COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
+        ARGS
+          --solution
+          ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
+          --workingdir
+          ${VIEWER_BINARY_NAME}
+          "${CMAKE_CURRENT_SOURCE_DIR}"
+        COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
+        )
 
     if (PACKAGE)
       add_custom_command(