[Hexagon] Reverting 220584 to address ASAN errors.