[Sanitizer] Revert r193501 and properly fix r193448