We cherry-picked this in Bug 1685245.