Revert "Fix #1171 - Simplify some/any."

This reverts commit 962121722a0440816a27f709056e5ed397e5ced5.