We cherry-picked this in bug 1902618.