little change from a previous cherry-pick