This reverts commit r327041 and the followup attempts at fixing the testcase as they're still failing. llvm-svn: 327094