tpr added a comment. Ah, I didn't see r286134. How do you mean, partially revert it? It looks like I want to completely revert it and fix the comment for semantic correctness, then think about optimizing the cases when the s_and is not needed. https://reviews.llvm.org/D41292