Reverting r208848, reason: build failure: sanitizer-x86_64-linux-bootstrap/builds/3399