3.0 validation fixes

Fixes #3873
I just realized that this line should not be here