As long as we are not introducing a new technical debt I think it's fine. I wouldn't fix it now then given that it might be fixed in upstream in the future and we would get it for free. Going to merge.