COOK-3384

@see http://tickets.opscode.com/browse/COOK-3384