California water-bill fight is percolating again on Capitol