Comment 2 for bug 2013199

This probably has the same root cause as bug 1961508 so let's group it there until proven otherwise. I also don't expect to see anyone working on either bug before kinetic reaches end of life in July so this will be a necessary cleanup anyway.