Revert "Fix a build breakage. Looks like the LLVM side of this change has been reverted"

This reverts commit r223375.  We need to use unique_ptr to build with
LLVM r223183.