Fix CHEF-4749
edits; new stubs