This reverts r364478 (git commit 574cb0eb) The patch is causing compilation timeouts. llvm-svn: 364846