Comment 8 for bug 1840348

@dbungert - Taking over this one for hillpd, we would like to pursue this backport to Bionic/Queens (dropping Stein).

Originally held back on it since there isn't a viable reproducer. Now, since the change has been in upstream since May 1, 2020, there is confidence that it doesn't introduce a regression.