We cherry-picked this in Bug 1810949.