diff --git a/args.gn b/args.gn
index 0811df5f..28e2f996 100644
--- a/args.gn
+++ b/args.gn
@@ -2,9 +2,9 @@ google_api_key = ""
 google_default_client_id = ""
 google_default_client_secret = ""
 visual_studio_version = "2022"
-# clang_base_path = "/usr/lib/llvm-16"
-# clang_version = "16"
-# use_polly = true
+clang_base_path = "/usr/lib/llvm-16"
+clang_version = "16"
+use_polly = true
 target_os = "win"
 target_cpu = "x64"
 is_official_build = true
@@ -43,7 +43,7 @@ enable_cros_media_app = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
 # Set to false for Polly build
-clang_use_chrome_plugins = true
+clang_use_chrome_plugins = false
 enable_ffmpeg_video_decoders = true
 is_component_ffmpeg = false
 use_webaudio_ffmpeg = false
diff --git a/other/AVX2/AVX2_args.gn b/other/AVX2/AVX2_args.gn
index 2ee4a4a1..7b73bdb7 100644
--- a/other/AVX2/AVX2_args.gn
+++ b/other/AVX2/AVX2_args.gn
@@ -2,10 +2,9 @@ google_api_key = ""
 google_default_client_id = ""
 google_default_client_secret = ""
 visual_studio_version = "2022"
-# is_chancie_wancie_build = true
-# clang_base_path = "/usr/lib/llvm-16"
-# clang_version = "16"
-# use_polly = true
+clang_base_path = "/usr/lib/llvm-16"
+clang_version = "16"
+use_polly = true
 target_os = "win"
 target_cpu = "x64"
 is_official_build = true
@@ -43,7 +42,7 @@ enable_cros_media_app = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
 # Set to false for Polly build
-clang_use_chrome_plugins = true
+clang_use_chrome_plugins = false
 enable_ffmpeg_video_decoders = true
 is_component_ffmpeg = false
 use_webaudio_ffmpeg = false
diff --git a/other/SSE2/SSE2_args.gn b/other/SSE2/SSE2_args.gn
index d3e1663f..b01e729e 100644
--- a/other/SSE2/SSE2_args.gn
+++ b/other/SSE2/SSE2_args.gn
@@ -3,9 +3,9 @@ google_default_client_id = ""
 google_default_client_secret = ""
 visual_studio_version = "2022"
 msvc_use_sse2 = true
-# clang_base_path = "/usr/lib/llvm-16"
-# clang_version = "16"
-# use_polly = true
+clang_base_path = "/usr/lib/llvm-16"
+clang_version = "16"
+use_polly = true
 target_os = "win"
 target_cpu = "x86"
 is_official_build = true
@@ -43,7 +43,7 @@ enable_cros_media_app = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
 # Set to false for Polly build
-clang_use_chrome_plugins = true
+clang_use_chrome_plugins = false
 enable_ffmpeg_video_decoders = true
 is_component_ffmpeg = false
 use_webaudio_ffmpeg = false
diff --git a/other/SSE3/args_SSE3.gn b/other/SSE3/args_SSE3.gn
index 208555ab..54d844f5 100644
--- a/other/SSE3/args_SSE3.gn
+++ b/other/SSE3/args_SSE3.gn
@@ -2,9 +2,9 @@ google_api_key = ""
 google_default_client_id = ""
 google_default_client_secret = ""
 visual_studio_version = "2022"
-# clang_base_path = "/usr/lib/llvm-16"
-# clang_version = "16"
-# use_polly = true
+clang_base_path = "/usr/lib/llvm-16"
+clang_version = "16"
+use_polly = true
 target_os = "win"
 target_cpu = "x64"
 is_official_build = true
@@ -42,7 +42,7 @@ enable_cros_media_app = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
 # Set to false for Polly build
-clang_use_chrome_plugins = true
+clang_use_chrome_plugins = false
 enable_ffmpeg_video_decoders = true
 is_component_ffmpeg = false
 use_webaudio_ffmpeg = false
diff --git a/setup.sh b/setup.sh
index 717b251f..0330e993 100755
--- a/setup.sh
+++ b/setup.sh
@@ -26,8 +26,6 @@ displayHelp () {
 	printf "${bold}${YEL}Use the --sse3 flag for SSE3 Builds.${c0}\n" &&
 	printf "${bold}${YEL}Use the --sse2 flag for 32 bit SSE2 Builds.${c0}\n" &&
 	printf "${bold}${YEL}Use the --android flag for Android Builds.${c0}\n" &&
-	printf "${bold}${YEL}IMPORTANT: For Polly builds, first run build_polly.sh in Thorium/infra, then use the setup_polly.sh${c0}\n" &&
-	printf "${bold}${YEL}script in Thorium/other/Polly. Both of these actions should be taken AFTER running this script!${c0}\n" &&
 	printf "\n"
 }
 case $1 in