Revert "Update set validator"

This reverts commit 4352ff7e51a028b4ba79ad7c87adc380a6ffb456.