Revereted to explicit validation.