Revert "re #10230 fix validation error"

This reverts commit d176de98dffb134d1f96c36a82e24a81e32b2ca7.
Revert "re #10230 fix validation error"

This reverts commit 1d455ec385ccd9ac258a9b1080fcef25900fad8a.