Chef 4639

https://tickets.opscode.com/browse/CHEF-4639