Rather then commenting the section out, we will need to either hardcode the if to never fire, or remove the section entirely. So that the extra hunks of the renaming of the 'rand' field gets grabbed by S2S