COOK-2381

Ref: http://tickets.opscode.com/browse/COOK-2381