Fix broken build due to cherry-pick picking a bit too much