This reverts commit 11850a63, it was causing build failures on numerous bots, including sanitizer-x86_64-linux-bootstrap-ubsan.