We cherry-picked this in bug 2054619.