[msan] Partial revert of r210331.

Bots did not like it.