We cherry-picked this in bug 1615282.