Revert "Update for LLVM API change in r221024"

This reverts commit r221073 to match upstream revert in r221711.