Revert "fixing validation"

This reverts commit 0fdd1838e094126aa0a446012e85edd09e828567.