Unasync Chef (1.6.x)

This is the cherry-pick for #81.