hopefully final cpplint fix