Revert r204562,204566,204586,204587 as they broke ASan on Windows