cherry-picking a bug fix