Revert "temporary fix for impractical validation"

This reverts commit 46bec78c5c70c9352e193ae2eb6596b4f1c75fd9.