This reverts r364877 (git commit dfae3705) This didn't solve my problem so I've reverted it. llvm-svn: 364878