Comment 2 for bug 1848512

bunch of changes merged with the workaround but we did a terrible job of tracking those and did not include this bug (bug was filed after some of the changes merged)

capturing related changes here at least as many as i could quickly find

https://review.opendev.org/689719
https://review.opendev.org/689527
https://review.opendev.org/689144
https://review.opendev.org/689170
https://review.opendev.org/689148
https://review.opendev.org/689129