diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index 63132304daf4..73117d75086f 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -111,7 +111,7 @@ WORKDIR $SRC
 
 RUN git clone https://github.com/AFLplusplus/AFLplusplus.git aflplusplus && \
     cd aflplusplus && \
-    git checkout b81e0fece61d344b506c9d1aab7f69b89665ef81 && \
+    git checkout 091d66fa92cd9e4caa5829d579b1b996c49db8c9 && \
     wget --no-check-certificate -O oss.sh https://raw.githubusercontent.com/vanhauser-thc/binary_blobs/master/oss.sh && \
     rm -rf .git && \
     chmod 755 oss.sh
diff --git a/infra/base-images/base-builder/compile_afl b/infra/base-images/base-builder/compile_afl
index d9d5a82c9a61..484d4668c866 100644
--- a/infra/base-images/base-builder/compile_afl
+++ b/infra/base-images/base-builder/compile_afl
@@ -15,10 +15,8 @@
 #
 ################################################################################
 
-# Temporarily disable randomization and enforce a safe and sane setup
-
-# In emergencies where afl++'s own compiler fails set this to "1":
-export AFL_LLVM_MODE_WORKAROUND=0
+# If LLVM once again does weird changes then enable this:
+#export AFL_LLVM_INSTRUMENT=LLVM-NATIVE
 
 # AFL++ setup
 echo "Copying precompiled AFL++"
@@ -44,7 +42,6 @@ export AFL_IGNORE_PROBLEMS=1
 # No complain on unknown AFL environment variables
 export AFL_IGNORE_UNKNOWN_ENVS=1
 
-
 # Provide a way to document the AFL++ options used in this build:
 echo
 echo AFL++ target compilation setup:
diff --git a/projects/libcacard/build.sh b/projects/libcacard/build.sh
index f12cb416da26..e461a6773673 100755
--- a/projects/libcacard/build.sh
+++ b/projects/libcacard/build.sh
@@ -15,10 +15,6 @@
 #
 ################################################################################
 
-# Workaround for fixing AFL++ build, discarded for others.
-# See https://github.com/google/oss-fuzz/issues/4280#issuecomment-773977943
-export AFL_LLVM_INSTRUMENT=CLASSIC,NGRAM-4
-
 # Compile NSS
 mkdir $SRC/nss-nspr
 mv $SRC/nss $SRC/nss-nspr/
diff --git a/projects/poppler/build.sh b/projects/poppler/build.sh
index 92d89cb218c4..2306aeb5753d 100755
--- a/projects/poppler/build.sh
+++ b/projects/poppler/build.sh
@@ -21,9 +21,6 @@ export PKG_CONFIG="`which pkg-config` --static"
 export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
 export PATH=$PREFIX/bin:$PATH
 
-# AFL++ specific setting
-export AFL_LLVM_INSTRUMENT=NATIVE
-
 BUILD=$WORK/build
 
 rm -rf $WORK/*