Comment 37 for bug 1998625

I pushed an additional cherry-pick to stable/wallaby since we asserted in the pre-OSSA that the patch applies cleanly there. Also, as Tim noted in comment #23, "For earlier branches, it should be fairly easy to cherry-pick; it's simple context differences for stable/train through stable/victoria, and a minor unit test conflict for stable/rocky and stable/stein."