Reapplying the changes from r158717 as they were rolled back to avoid merge conflicts from a separate problematic patch.

llvm-svn: 158750