This reverts r369159 (git commit cbaf1fde) r369160 caused a test to fail under UBSAN. See thread on llvm-commits. llvm-svn: 369241