Previous cherry-pick didn't account for moved files