Revert "Revert "temporary fix for impractical validation""

This reverts commit c13073023783d56e78bf64e6d059479bf755abc9.