This reverts commit r229556. Reverting this for now as internal apple builds rely on this functionality. llvm-svn: 229585