We cherry-picked this in bug 1879752.