Summary: This revision trims unnecessary complexity. Differential Revision: https://reviews.llvm.org/D80290