Derp in cherry-pick