Revert "Merge branch 'avoid_adding_invalid_conditions_when_deserializing_filter'"

This reverts commit b9ad14f256a4676ff294d773c3bf67ea2b9fd27b, reversing
changes made to 84b23958730c9289dad987aa74085757779cf44c.