Proposed California water law would revive Clean Water Act rules