We cherry-picked this in bug 1942551.