Revert "ANA-585: do not raise no CP error if where_clause is set"

This reverts commit 3376dcc93a40d67cdbccb14fe76b6e161bce445a.