We cherry-picked this in bug 2033420