We cherry-picked this in Bug 1832751