This reverts r361790 (git commit fe5eaab2) It's causing buildbot breakage, so reverting while I investigate. llvm-svn: 361793