We cherry-picked this in bug 1882438.