COOK-2335 refactor for Chef 11