Right, a combination of both.
On the partial deregulation, they allowed freemarket prices on purchasing power to sell to consumers, but the resale end is fixed price. Additionally they're prohibited from signing long term contracts with energy suppliers.
Citing this as a failure of deregulation, California is now looking at taking over utilities again. Interestingly, they plan to do this by 1) signing long term contracts with engery suppliers, and 2) raising consumer prices.