Revert "Fix taxonomy null caching and ensure taxonomy column in term queries"

This reverts commit 28bed54.

Author: ryanmitchell

src/Taxonomies/TaxonomyRepository.php

@@ -40,18 +40,11 @@ public function all(): Collection
 
     public function findByHandle($handle): ?TaxonomyContract
     {
-        $blinkKey = "eloquent-taxonomies-{$handle}";
-        $taxonomyModel = Blink::once($blinkKey, function () use ($handle) {
+        $taxonomyModel = Blink::once("eloquent-taxonomies-{$handle}", function () use ($handle) {
             return app('statamic.eloquent.taxonomies.model')::whereHandle($handle)->first();
         });
 
-        if (! $taxonomyModel instanceof Model) {
-            Blink::forget($blinkKey);
-
-            return null;
-        }
-
-        return app(TaxonomyContract::class)->fromModel($taxonomyModel);
+        return $taxonomyModel instanceof Model ? app(TaxonomyContract::class)->fromModel($taxonomyModel) : null;
     }
 
     public function findByUri(string $uri, ?string $site = null): ?Taxonomy

src/Taxonomies/TermQueryBuilder.php

@@ -174,11 +174,6 @@ public function get($columns = ['*'])
     {
         $this->applyCollectionAndTaxonomyWheres();
 
-        // Ensure 'taxonomy' is always selected as it's required for Term::fromModel().
-        if (! in_array('*', $columns) && ! in_array('taxonomy', $columns)) {
-            $columns[] = 'taxonomy';
-        }
-
         $items = parent::get($columns);
 
         // If a single collection has been queried, we'll supply it to the terms so
@@ -217,11 +212,6 @@ public function paginate($perPage = null, $columns = [], $pageName = 'page', $pa
     {
         $this->applyCollectionAndTaxonomyWheres();
 
-        // Ensure 'taxonomy' is always selected as it's required for Term::fromModel().
-        if (! in_array('*', $columns) && ! in_array('taxonomy', $columns)) {
-            $columns[] = 'taxonomy';
-        }
-
         return parent::paginate($perPage, $columns, $pageName, $page);
     }