Fix cherry-pick leftovers
2 files changed