Revert "Use track cid streaming and fallback track id streaming (#4635)"

This reverts commit 051d92a.

discovery-provider/src/api/v1/tracks.py

@@ -461,15 +461,15 @@ def get(self, track_id):
         primary_node = creator_nodes[0]
         signature_param = urllib.parse.quote(json.dumps(signature))
         track_cid = track["track_cid"]
-        if not track_cid:
-            logger.warning(
-                f"tracks.py | stream | We should not reach here! If you see this, it's because the track with id {track_id} has no track_cid. Please investigate."
-            )
-            path = f"tracks/stream/{track_id}"
-        elif not CID_STREAM_ENABLED:
-            path = f"tracks/stream/{track_id}"
-        else:
+        if CID_STREAM_ENABLED:
+            if not track_cid:
+                logger.info(
+                    f"We should not reach here! If you see this, it's because the track with id {track_id} has no track_cid. Please investigate."
+                )
+                abort_not_found(track_id, ns)
             path = f"tracks/cidstream/{track_cid}?signature={signature_param}"
+        else:
+            path = f"tracks/stream/{track_id}"
         stream_url = urljoin(primary_node, path)
 
         return stream_url

discovery-provider/src/queries/get_track_stream_signature.py

@@ -9,7 +9,7 @@
 from src.premium_content.signature import get_premium_content_signature
 from src.queries.get_authed_user import get_authed_user
 
-CID_STREAM_ENABLED = True
+CID_STREAM_ENABLED = False
 
 
 class GetTrackStreamSignature(TypedDict):