We cherry-picked this in bug 1966238