Put old validation back, fix later.