Revert HWASAN failure (#74163)

This is the failure:
https://lab.llvm.org/buildbot/#/builders/236/builds/7728/steps/10/logs/stdio

This started with eef8e1d2, but because
there were a couple of patches that came after that I had to revert all
3 of them because of merge conflicts.