Reinstate "Update for llvm API change.""

This reinstates r215113.