This reverts commit 5ff27fe1ff.
This patch caused failures in asan: https://lab.llvm.org/buildbot/#/builders/5/builds/24221
This reverts commit 5ff27fe1ff.
This patch caused failures in asan: https://lab.llvm.org/buildbot/#/builders/5/builds/24221