Also remove foldr2/right rule to avoid possibly introducing bottoms with rules. This effectively reverts most of 488e95b4 (cherry picked from commit f44bbc83)
