Comment 10 for bug 1789659

I did a code review to check for potential changes between 4.0 (what we have in Bionic) and 4.3 (when upstream created the fix) but found none that would make this change non-backportable (I was afraid of unrelated commits being required to make this safe - therefore the extra dive into the src).

Now prepping the actual Backport for a automated regression check.