Update cherries

Removing some cherries that cause regressions.