Re-introduce validation.