California solar power plan revived