Revert r199361: Now, the sanitizer got the change