Second try at r178075.  The llvm breakage has been fixed by r178240.