Follow up to r215323 - avoid llvm::make_unique in this particular case that's causing GCC on some buildbots some confusion.