[fix] post-cherry-pick fix