Fix/gh 7733

`XXX(indutny)`, right?  Doesn't cpplint complain about that?