As California enters what could be a record-breaking drought, a just-completed nine-year floodplain restoration project at the confluence of the San Joaquin and Tuolumne rivers offers an ambitious attempt at one mitigation solution.

At a 1,600-acre former dairy ranch called Dos Rios, the conservation organization River Partners removed berms that farmers had originally constructed to protect their alfalfa and wheat crops from the river. It turned fields into seasonal pools where endangered baby salmon and migratory birds can rest, and water can trickle down to refill aquifers. Last month, it planted the last of more than 350,000 native grasses, shrubs and trees — acres of towering willows, flowering elderberry and creeping wild rye chosen to thrive in flood or drought.