We cherry-picked this in bug 1832717