Yes, which is why your claim that Tom McClintock 'voted for it' was suspect.
The bill that he voted for in May doesn't even remotely resemble what SB238 has become since he voted on it. Notice that everything done to it since his vote has been done in the assembly, not the senate.