This reverts commit 0da27ba5. This revision was causing an error on the sanitizer-x86_64-linux-autoconf build.