--- mongodb-5.0.5-r2.ebuild	2023-01-11 20:41:01.895072599 +0100
+++ mongodb-5.0.5-r3.ebuild	2023-01-10 21:21:29.361053135 +0100
@@ -83,13 +83,6 @@
 }
 
 pkg_pretend() {
-	# Bug 809692
-	if use amd64 && ! use cpu_flags_x86_avx; then
-		eerror "MongoDB 5.0 requires use of the AVX instruction set"
-		eerror "https://docs.mongodb.com/v5.0/administration/production-notes/"
-		die "MongoDB requires AVX"
-	fi
-
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
 			ewarn "To upgrade from a version earlier than the 4.4-series, you must"
@@ -135,6 +128,7 @@
 	use debug && scons_opts+=( --dbg=on )
 	use kerberos && scons_opts+=( --use-sasl-client )
 	use lto && scons_opts+=( --lto=on )
+	use amd64 && ! use cpu_flags_x86_avx && scons_opts+=( --experimental-optimization=-sandybridge )
 
 	scons_opts+=( --ssl=$(usex ssl on off) )