As it was breaking bots running sanitizer lint check This reverts r374265 (git b577efe4) llvm-svn: 374308