Numerous scholars have noted that choice of law in the federal courts is a mess; this is particularly true in the damage class action context. Unfortunately, proposed solutions address only half of this “choice-of-law problem”: They focus either on removing the barriers choice of law creates for certification or on preserving choice of law’s traditional allocation of regulatory authority among the states, but no proposal has taken up both issues. The time has come to address this problem in full. Given the current climate of political and economic change, Congress should amend the Class Action Fairness Act of 2005 (CAFA) to revitalize the class action as a meaningful regulatory mechanism while still deterring the state court excesses that spurred CAFA’s enactment. My two-pronged proposal would do exactly that—facilitate certification of meritorious consumer cases while ensuring fair and effective allocation of regulatory authority between interested states.