Worked on backporting to Chef 10