diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0d0a4e3dc69..7dc2bb77e06d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -550,13 +550,8 @@ if(NOT MSVC)
   endif()
   set(CMAKE_CXX_FLAGS_DEBUG
       "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -DDEBUG -Wall ${M32_FLAG} ${CXX_EXTRA}")
-  if(NOT IS_ARM)
-    set(CMAKE_CXX_FLAGS_RELEASE
-        "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -DNDEBUG ${M32_FLAG} ${CXX_EXTRA}")
-  else()
-    set(CMAKE_CXX_FLAGS_RELEASE
-            "${CMAKE_CXX_FLAGS_RELEASE} -O3 -DNDEBUG ${M32_FLAG} ${CXX_EXTRA}")
-  endif()
+  set(CMAKE_CXX_FLAGS_RELEASE
+      "${CMAKE_CXX_FLAGS_RELEASE} -O3 -DNDEBUG ${M32_FLAG} ${CXX_EXTRA}")
   if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_LTO)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto=${CMAKE_LTO}")
   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_LTO)
diff --git a/third_party/snappy/snappy-stubs-internal.h b/third_party/snappy/snappy-stubs-internal.h
index 600b59c23a5e..135a9fe52e79 100644
--- a/third_party/snappy/snappy-stubs-internal.h
+++ b/third_party/snappy/snappy-stubs-internal.h
@@ -54,13 +54,10 @@
 #define HAVE_BUILTIN_PREFETCH 1
 #endif
 
-#if defined(__aarch64__) || defined(__ARM_ARCH)
+#if defined(__aarch64__)
+// These are enabled by default on aarch64
 #define SNAPPY_HAVE_NEON 1
 #define SNAPPY_HAVE_NEON_CRC32 1
-#else
-#define SNAPPY_HAVE_SSSE3 1
-#define SNAPPY_HAVE_X86_CRC32 1
-#define SNAPPY_HAVE_BMI2 1
 #endif
 
 #if HAVE_SYS_MMAN_H