This reverts commit 233659c7. I see some sanitizer build bot failures. Not sure if it is change causing it, but let's see if a revert returns the bots to green...
