We cherry-picked this in Bug 1694304.