Revert r221150, as it broke sanitizer tests