This reverts commit 934b1099. Buildbot failues on sanitizer-x86_64-linux-fast
mentioned in commit 192f7201