Only cherry-pick if really there is something to do.