Remove bogus validation post-6855