California revives program to buy water from farmers