Make clustering work

Fix for http://tickets.opscode.com/browse/COOK-2828