cherry-pick a fix for sockin