We cherry-picked this in bug 2058627.