--- a/old-configure.in
+++ b/old-configure.in
@@ -3732,24 +3732,24 @@ MOZ_ARG_DISABLE_BOOL(sandbox,
 
 dnl ========================================================
 dnl = Content process sandboxing
 dnl ========================================================
 if test -n "$gonkdir"; then
     MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX
 fi
 
-case "$OS_TARGET:$NIGHTLY_BUILD" in
-WINNT:*)
+case "$OS_TARGET" in
+WINNT)
     MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX
     ;;
-Darwin:*)
+Darwin)
     MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX
     ;;
-Linux:1)
+Linux)
     case $CPU_ARCH in
         x86_64|x86)
             MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX
         ;;
     esac
     ;;
 esac