We cherry-picked this in bug 2055093