We cherry-picked this in bug 1954903.