COOK-3033

http://tickets.opscode.com/browse/COOK-3033