cc49f70de8
* Make scrubber code use temporary vars consistently * fixes merge mess
* Make scrubber code use temporary vars consistently * fixes merge mess