Revert "Merge pull request #1637 from mehdishojaei/some_via_every"

This reverts commit 7feead9b2273daa82cb06f8c9580e94fe9fc58b1, reversing
changes made to a7ee4f95396f68cd4abefff841763d744f5f6251.