We cherry-picked this in Bug 1828065.