Revert "2.03.1:schwarherz:3 validation fixes"

This reverts commit 56fb3f6faa2e0c00460089f597fdd44b66b2b95a.