Undeprecate and switch back to validator, to reduce annoyance.