This reverts commit 193ac6993b64a502db6dc7f2d69dafc47c318407. The buildbot says the test still fails. :) llvm-svn: 236500