Fix hosted chef (cherry-pick ec6c561f0d)

This is just the cherry-pick for ec6c561f0d