Fix build break introduced by git cherry-pick