This reverts commit 312ab058. My commit broke the build; I will revert and find out what happened. llvm-svn: 356951