This reverts commit 5aa7478a. Some things are broken; I will fix and try to commit again. llvm-svn: 356949