Cook 3765

See https://tickets.opscode.com/browse/COOK-3765