This reverts r369160 (git commit f72d9b1c) r369160 caused some tests to fail under UBSAN. See thread on llvm-commits. llvm-svn: 369236