We cherry-picked this in bug 1876895.