I'm only against custom cherry-pick shenanigans