cherry-picking not as smart as i thought