Fix http://tickets.opscode.com/browse/COOK-3329