We cherry-picked this in bug 1901767.