This reverts commit e286fefa since the issue affecting the sanitizer-ppc64le-linux builder is resolved.