remove merged cherry-pick 4343