This reverts commit ea606cce. This patch causes memory sanitizer failures sanitizer-x86_64-linux-fast.