We cherry-picked this in bug 1914196