Fix https://tickets.opscode.com/browse/CHEF-4551