California lawmaker scraps plan to replace carbon market with tax on fuels