zturner added a comment. Not sure if this will be necessary. I already applied these changes as part of https://reviews.llvm.org/D33024. chandlerc@ said it's fine to do it in the same patch as the move. Sorry for forgetting about it earlier though. https://reviews.llvm.org/D33052