Please add a link to the Bug report for the commented out section.