reverted wholeFieldPredicate body re: @fgregg