Revert r215415 which causse MSan to crash on a great deal of C++ code.
I've followed up on the original commit as well.