We cherry-picked this in bug 1900057.