Get rid of predicates_defined_on
#129546
Merged
predicates_defined_on
#129546
predicates_defined_on
#129546