Change the if to if(false) instead of commenting to allow S2S to remap this section of code.