Dealer franchise legislation back on in California