Reverting r76825 and r76828, since they caused clang runtime errors and some build failure involving memset.

llvm-svn: 76838