You should remove all the comment stuff, if you remove it all in one commit then you can just revert that commit later when this gets merged in.