Just go back to one immutable set of physical standards.
Yup, problem solved. Would keep all the limp wrists out too.