llvm-svn: 239657
This reverts commit 4ea70107c5e51230e9e60f0bf58a0f74aa4885ea. llvm-svn: 160303
llvm-svn: 160270