fix up from s2w cherry-pick