Revert r15266. This fixes llvm.org/pr15266.