Revert "take with confidence out of whereclause"

This reverts commit 34c4bad73f96626d886cebbd9e43a5299d4830fb.