How Diversity Trumped Equity—and May Kill Affirmative Action