Pickup fix for https://tickets.opscode.com/browse/COOK-3617