dberris reopened this revision. dberris added a comment. This revision is now accepted and ready to land. Reverted in https://reviews.llvm.org/rL280968 -- we should resolve https://reviews.llvm.org/D23931 before attempting to land again. https://reviews.llvm.org/D23932