Revert "fixing validation"

This reverts commit 95fdfb3aab59a0ada5788285a37d24de50a042e7.