3944da57b1
Rewrite the changes from commit 4785c85 to work with validation.
Rewrite the changes from commit 4785c85 to work with validation.