We cherry-picked this in bug 1953080.