This reverts commit 102bc634cb4129d9984a8da8515af945e8a5568b because some tests are failing on sanitizer bots.