#1559 is worked around elsewhere, so validate no longer needs to