Remove cherry-picking's added text