We cherry-picked this in bug 1865872