Part 1 of a cherry-pick not quite working