We cherry-picked this in bug 2040112.