Disabled comments in upstream version...