I'd prefer to see these lines removed rather than commented out if we are really ready to pull this into the mainline.   Even moreso with others below.