This reverts commit 2cabea05. Test failure on buildbots. llvm-svn: 357048
mentioned in commit f7d6a259
mentioned in commit c777fea9