From 6aabe915e891bbbac5cc52658136d87ef21eddfd Mon Sep 17 00:00:00 2001
From: Matias Szylkowski <mszylkowski@google.com>
Date: Tue, 21 Dec 2021 14:45:09 -0500
Subject: [PATCH 1/3] Added tasts

---
 .vscode/tasks.json | 70 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 .vscode/tasks.json

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 000000000000..ea550d21e7a9
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,70 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "amp: Run unit test in this file",
+      "detail": "amp unit --files=${file} --headless --verbose",
+      "type": "shell",
+      "command": "amp",
+      "args": ["unit", "--files=${file}", "--headless", "--verbose"],
+      "group": "test",
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": true
+      }
+    },
+    {
+      "label": "amp: Watch unit test in this file",
+      "detail": "amp unit --files=${file} --headless --verbose --watch",
+      "type": "shell",
+      "command": "amp",
+      "args": ["unit", "--files=${file}", "--headless", "--verbose", "--watch"],
+      "group": "test",
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": true
+      },
+      "isBackground": true
+    },
+    {
+      "label": "amp: Run unit tests in all changed files",
+      "detail": "amp unit --local_changes --headless --verbose",
+      "type": "shell",
+      "command": "amp",
+      "args": ["unit", "--local_changes", "--headless", "--verbose"],
+      "group": "test",
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": true
+      }
+    },
+    {
+      "label": "amp: Check PR",
+      "detail": "amp pr-check --nobuild",
+      "type": "shell",
+      "command": "amp",
+      "args": ["pr-check", "--nobuild"],
+      "group": "test",
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": true
+      }
+    },
+  ]
+}
\ No newline at end of file

From dc1fa876f8e029a54a7cfd4bf2f70795da071102 Mon Sep 17 00:00:00 2001
From: Matias Szylkowski <mszylkowski@google.com>
Date: Tue, 21 Dec 2021 14:47:32 -0500
Subject: [PATCH 2/3] Undo

---
 .vscode/tasks.json | 70 ----------------------------------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 .vscode/tasks.json

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
deleted file mode 100644
index ea550d21e7a9..000000000000
--- a/.vscode/tasks.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "amp: Run unit test in this file",
-      "detail": "amp unit --files=${file} --headless --verbose",
-      "type": "shell",
-      "command": "amp",
-      "args": ["unit", "--files=${file}", "--headless", "--verbose"],
-      "group": "test",
-      "presentation": {
-        "echo": true,
-        "reveal": "always",
-        "focus": false,
-        "panel": "shared",
-        "showReuseMessage": true,
-        "clear": true
-      }
-    },
-    {
-      "label": "amp: Watch unit test in this file",
-      "detail": "amp unit --files=${file} --headless --verbose --watch",
-      "type": "shell",
-      "command": "amp",
-      "args": ["unit", "--files=${file}", "--headless", "--verbose", "--watch"],
-      "group": "test",
-      "presentation": {
-        "echo": true,
-        "reveal": "always",
-        "focus": false,
-        "panel": "shared",
-        "showReuseMessage": true,
-        "clear": true
-      },
-      "isBackground": true
-    },
-    {
-      "label": "amp: Run unit tests in all changed files",
-      "detail": "amp unit --local_changes --headless --verbose",
-      "type": "shell",
-      "command": "amp",
-      "args": ["unit", "--local_changes", "--headless", "--verbose"],
-      "group": "test",
-      "presentation": {
-        "echo": true,
-        "reveal": "always",
-        "focus": false,
-        "panel": "shared",
-        "showReuseMessage": true,
-        "clear": true
-      }
-    },
-    {
-      "label": "amp: Check PR",
-      "detail": "amp pr-check --nobuild",
-      "type": "shell",
-      "command": "amp",
-      "args": ["pr-check", "--nobuild"],
-      "group": "test",
-      "presentation": {
-        "echo": true,
-        "reveal": "always",
-        "focus": false,
-        "panel": "shared",
-        "showReuseMessage": true,
-        "clear": true
-      }
-    },
-  ]
-}
\ No newline at end of file

From 98628ef869f440e84aace1486f65a168bcac4d9f Mon Sep 17 00:00:00 2001
From: Matias Szylkowski <mszylkowski@google.com>
Date: Wed, 29 Dec 2021 10:46:54 -0500
Subject: [PATCH 3/3] Removed all affiliate link code from amp-story

---
 examples/amp-story/affiliate-link.html        | 118 -------------
 examples/amp-story/analytics.html             |  29 +--
 examples/amp-story/auto-analytics.html        |  29 +--
 .../1.0/amp-story-affiliate-link.css          | 167 ------------------
 .../amp-story/1.0/amp-story-affiliate-link.js | 164 -----------------
 .../1.0/amp-story-embedded-component.js       |   2 +-
 extensions/amp-story/1.0/amp-story-page.js    |  17 --
 .../amp-story/1.0/amp-story-store-service.js  |  10 --
 extensions/amp-story/1.0/amp-story.css        |   1 -
 extensions/amp-story/1.0/page-advancement.js  |  34 ----
 .../test-amp-story-affiliate-link.js          |  70 --------
 11 files changed, 3 insertions(+), 638 deletions(-)
 delete mode 100644 examples/amp-story/affiliate-link.html
 delete mode 100644 extensions/amp-story/1.0/amp-story-affiliate-link.css
 delete mode 100644 extensions/amp-story/1.0/amp-story-affiliate-link.js
 delete mode 100644 extensions/amp-story/1.0/test/integration/test-amp-story-affiliate-link.js

diff --git a/examples/amp-story/affiliate-link.html b/examples/amp-story/affiliate-link.html
deleted file mode 100644
index 1e1407348fa8..000000000000
--- a/examples/amp-story/affiliate-link.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!doctype html>
-<html amp lang="en">
-  <head>
-    <meta charset="utf-8">
-    <script async src="https://cdn.ampproject.org/v0.js"></script>
-    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
-    <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
-    <title>My Story</title>
-    <meta name="viewport"
-          content="width=device-width,minimum-scale=1,initial-scale=1">
-    <link rel="canonical" href="blink-link.html">
-    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-    <style amp-custom>
-      body {
-        font-family: 'Roboto', sans-serif;
-      }
-      amp-story-page {
-        background: black;
-      }
-      h1 {
-        color: white;
-        font-size: 2.875em;
-        font-weight: normal;
-        line-height: 1.174;
-        text-transform: uppercase;
-      }
-      p {
-        color: white;
-      }
-    </style>
-  </head>
-
-  <body>
-    <amp-story standalone>
-
-      <amp-story-page id="cover">
-        <amp-story-grid-layer template="vertical">
-          <h1>Hello World</h1>
-          <p>This is the cover page of this story.</p>
-        </amp-story-grid-layer>
-      </amp-story-page>
-
-      <amp-story-page id="page-1">
-        <amp-story-grid-layer template="vertical">
-          <h1>First Page</h1>
-          <p>This is the first page of this story.</p>
-        </amp-story-grid-layer>
-      </amp-story-page>
-
-      <amp-story-page id="page-2">
-          <amp-story-grid-layer template="vertical">
-              <h1>Second Page</h1>
-              <p>This is the second page of this story.</p>
-            </amp-story-grid-layer>
-            <amp-story-grid-layer template="horizontal" style="padding-top: 260px">
-              <amp-img
-                src="./img/merch1.jpg"
-                width="120"
-                height="160"
-                max-width="210"
-                layout="fixed">
-              </amp-img>
-              <a id="blink-1" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="shopping-cart">
-                amp.devamp.devamp.devamp.devamp.devamp.dev
-              </a>
-            </amp-story-grid-layer>
-            <amp-story-grid-layer template="horizontal" style="padding-top: 450px">
-              <a id="blink-2" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="flight">
-                amp.devamp.devamp.devamp.devamp.devamp.dev
-              </a>
-            </amp-story-grid-layer>
-        </amp-story-page>
-
-        <amp-story-page id="page-3">
-          <amp-story-grid-layer template="vertical">
-            <h1>Third Page</h1>
-            <a id="blink-3" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="shopping-cart">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-4" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="offer">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-5" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="flight">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-6" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="hotel">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-7" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="movie">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-8" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="activity">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-9" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="more-to-read">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-          </amp-story-grid-layer>
-        </amp-story-page>
-    </amp-story>
-    <amp-analytics>
-      <script type="application/json">
-      {
-        "requests": {
-          "click": "?eventId=123"
-        },
-        "triggers": {
-          "trackLinkClicks": {
-            "on": "click",
-            "selector": "[affiliate-link-icon]",
-            "request": "click"
-          }
-        }
-      }
-      </script>
-    </amp-analytics>
-  </body>
-</html>
diff --git a/examples/amp-story/analytics.html b/examples/amp-story/analytics.html
index f4597626d4aa..43aeeb61c60e 100644
--- a/examples/amp-story/analytics.html
+++ b/examples/amp-story/analytics.html
@@ -135,34 +135,7 @@ <h1>Page Three</h1>
         <amp-story-page-attachment layout="nodisplay" href="https://google.com"></amp-story-page-attachment>
       </amp-story-page>
 
-      <amp-story-page id="p4" style="background-color: grey">
-          <amp-story-grid-layer template="vertical">
-            <h1>Page Four</h1>
-            <a id="blink-3" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="shopping-cart">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-4" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="offer">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-5" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="flight">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-6" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="hotel">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-7" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="movie">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-8" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="activity">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-9" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="more-to-read">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-          </amp-story-grid-layer>
-        </amp-story-page>
-
-      <amp-story-page id="p5">
+      <amp-story-page id="p4">
         <amp-story-grid-layer template="vertical">
           <h1>Page Five</h1>
           <amp-video
diff --git a/examples/amp-story/auto-analytics.html b/examples/amp-story/auto-analytics.html
index f366be2a4678..870aa79d6ed2 100644
--- a/examples/amp-story/auto-analytics.html
+++ b/examples/amp-story/auto-analytics.html
@@ -69,34 +69,7 @@ <h1>Page Three</h1>
         </amp-story-cta-layer>
       </amp-story-page>
 
-      <amp-story-page id="p4" style="background-color: grey">
-          <amp-story-grid-layer template="vertical">
-            <h1>Page Four</h1>
-            <a id="blink-3" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="shopping-cart">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-4" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="offer">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-5" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="flight">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-6" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="hotel">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-7" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="movie">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-8" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="activity">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-            <a id="blink-9" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="more-to-read">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-          </amp-story-grid-layer>
-        </amp-story-page>
-
-      <amp-story-page id="p5">
+      <amp-story-page id="p4">
         <amp-story-grid-layer template="vertical">
           <h1>Page Five</h1>
           <amp-video
diff --git a/extensions/amp-story/1.0/amp-story-affiliate-link.css b/extensions/amp-story/1.0/amp-story-affiliate-link.css
deleted file mode 100644
index 174b21c29e2c..000000000000
--- a/extensions/amp-story/1.0/amp-story-affiliate-link.css
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
- [affiliate-link-icon] {
-  position: relative !important;
-  width: 50px !important;
-  height: 50px !important;
-}
-
-[affiliate-link-icon]:not([expanded]),
-[affiliate-link-icon]:not([expanded]) .i-amphtml-story-affiliate-link-circle {
-  animation: i-amphtml-story-affiliate-link-collapse 0.2s cubic-bezier(0.4, 0.0, 0.2, 1) forwards !important;
-}
-
-[affiliate-link-icon][pristine], [affiliate-link-icon][pristine] .i-amphtml-story-affiliate-link-circle {
-  animation: none !important;
-}
-
-amp-story-page[active] [affiliate-link-icon][expanded], amp-story-page[active] [affiliate-link-icon][expanded] .i-amphtml-story-affiliate-link-circle {
-  animation: i-amphtml-story-affiliate-link-expand 0.2s cubic-bezier(0.4, 0.0, 0.2, 1) forwards !important;
-  transform-origin: left !important;
-}
-
-@keyframes i-amphtml-story-affiliate-link-expand {
-  0% {
-    width: 40px;
-    border-radius: 50%;
-  }
-  100% {
-    width: 160px;
-    border-radius: 20px;
-  }
-}
-
-@keyframes i-amphtml-story-affiliate-link-collapse {
-  0% {
-    width: 160px;
-    border-radius: 20px;
-  }
-  100% {
-    width: 40px;
-    border-radius: 50%;
-  }
-}
-
-.i-amphtml-story-affiliate-link-circle {
-  position: absolute !important;
-  background: rgba(255, 255, 255, 1) !important;
-  margin: 5px !important;
-  width: 40px !important;
-  height: 40px !important;
-  display: flex !important;
-  justify-content: space-between !important;
-  border-radius: 20px !important;
-}
-
-[affiliate-link-icon][expanded] .i-amphtml-story-affiliate-link-circle {
-  overflow: hidden !important;
-}
-
-[affiliate-link-icon] .i-amphtml-story-reset.i-amphtml-hidden {
-  display: flex !important;
-  justify-content: space-between !important;
-}
-
-.i-amphtml-story-affiliate-link-text {
-  visibility: hidden !important;
-  text-align: center !important;
-  text-overflow: ellipsis !important;
-  overflow: hidden !important;
-  white-space: nowrap !important;
-  max-width: 70px !important;
-  width: 70px !important;
-  font-family: 'Roboto', sans-serif !important;
-  font-size: 14px !important;
-  color: #3C4043 !important;
-  letter-spacing: 0 !important;
-  line-height: 40px !important;
-}
-
-.i-amphtml-story-affiliate-link-launch {
-  visibility: hidden !important;
-  background-position: center !important;
-  background-repeat: no-repeat !important;
-  background-size: 18px 18px !important;
-  width: 40px !important;
-  height: 40px !important;
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 48 48" fill="%23757575"><path d="M0 0h48v48H0z" fill="none"/><path d="M38 38H10V10h14V6H10a4 4 0 0 0-4 4v28a4 4 0 0 0 4 4h28a4 4 0 0 0 4-4V24h-4v14zM28 6v4h7.2L15.5 29.7l2.8 2.8L38 12.8V20h4V6H28z"/></svg>') !important;
-}
-
-amp-story-page[active] .i-amphtml-story-affiliate-link-pulse {
-  position: absolute !important;
-  border-radius: 50% !important;
-  background: rgba(255, 255, 255, 0.4) !important;
-  margin: 5px !important;
-  width: 40px !important;
-  height: 40px !important;
-  animation: pulse 1.5s cubic-bezier(0.4, 0.0, 0.2, 1) infinite alternate !important;
-}
-
-@keyframes pulse {
-  0% {
-    transform: scale(1);
-  }
-  100% {
-    transform: scale(1.3);
-  }
-}
-
-[affiliate-link-icon][expanded] .i-amphtml-story-affiliate-link-pulse {
-  animation: none !important;
-}
-
-[affiliate-link-icon][expanded] .i-amphtml-story-affiliate-link-text {
-  visibility: visible !important;
-}
-
-[affiliate-link-icon][expanded] .i-amphtml-story-affiliate-link-launch {
-  visibility: visible !important;
-}
-
-@media any-hover {
-  [affiliate-link-icon]:hover .i-amphtml-story-affiliate-link-circle {
-    background: rgba(255, 255, 255, 0.4) !important;
-  }
-
-  [affiliate-link-icon]:hover .i-amphtml-story-affiliate-link-pulse {
-    background: none !important;
-    animation: none !important;
-  }
-}
-
-.i-amphtml-story-affiliate-link-icon {
-  background-position: center !important;
-  background-repeat: no-repeat !important;
-  background-size: 24px 24px !important;
-  color: rgba(0, 0, 0, 0.54) !important;
-  width: 40px !important;
-  height: 40px !important;
-}
-
-[affiliate-link-icon="shopping-cart"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#005AF0"><path d="M7 18a2 2 0 1 0 0 4 2 2 0 0 0 0-4zM1 2v2h2l3.6 7.6L5.2 14A2 2 0 0 0 7 17h12v-2H7.4a.2.2 0 0 1-.2-.3l.9-1.7h7.5a2 2 0 0 0 1.7-1l3.6-6.5.1-.5c0-.6-.4-1-1-1H5.2l-1-2H1zm16 16a2 2 0 1 0 0 4 2 2 0 0 0 0-4z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
-}
-
-[affiliate-link-icon="offer"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#005AF0"><path d="M0 0h24v24H0z" fill="none"/><path d="m21.4 11.6-9-9A2 2 0 0 0 11 2H4a2 2 0 0 0-2 2v7c0 .6.2 1 .6 1.4l9 9a2 2 0 0 0 2.8 0l7-7c.4-.4.6-.9.6-1.4 0-.6-.2-1-.6-1.4zM5.5 7a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"/></svg>') !important;
-}
-
-[affiliate-link-icon="flight"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#005AF0"><path d="M21 16v-2l-8-5V3.5a1.5 1.5 0 1 0-3 0V9l-8 5v2l8-2.5V19l-2 1.5V22l3.5-1 3.5 1v-1.5L13 19v-5.5l8 2.5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
-}
-
-[affiliate-link-icon="hotel"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#005AF0"><path d="M0 0h24v24H0z" fill="none"/><path d="M7 13a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm12-6h-8v7H3V5H1v15h2v-3h18v3h2v-9a4 4 0 0 0-4-4z"/></svg>') !important;
-}
-
-[affiliate-link-icon="movie"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#005AF0"><path d="m18 4 2 4h-3l-2-4h-2l2 4h-3l-2-4H8l2 4H7L5 4H4a2 2 0 0 0-2 2v12c0 1.1.9 2 2 2h16a2 2 0 0 0 2-2V4h-4z"/><path d="M0 0h24v24H0z" fill="none"/></svg>') !important;
-}
-
-[affiliate-link-icon="activity"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#005AF0"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 12c0-1.1.9-2 2-2V6a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v4a2 2 0 0 1 0 4v4c0 1.1.9 2 2 2h16a2 2 0 0 0 2-2v-4a2 2 0 0 1-2-2zm-4.4 4.8L12 14.5l-3.6 2.3 1.1-4.1L6.2 10l4.3-.3L12 5.8l1.5 4 4.3.2-3.3 2.7 1 4.1z"/></svg>') !important;
-}
-
-[affiliate-link-icon="more-to-read"] .i-amphtml-story-affiliate-link-icon {
-  background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#005AF0"><path fill="none" d="M-74 29h48v48h-48V29zM0 0h24v24H0V0zm0 0h24v24H0V0z"/><path d="M13 12h7v1.5h-7zm0-2.5h7V11h-7zm0 5h7V16h-7zM21 4H3a2 2 0 0 0-2 2v13c0 1.1.9 2 2 2h18a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2zm0 15h-9V6h9v13z"/></svg>') !important;
-}
\ No newline at end of file
diff --git a/extensions/amp-story/1.0/amp-story-affiliate-link.js b/extensions/amp-story/1.0/amp-story-affiliate-link.js
deleted file mode 100644
index 53841b489136..000000000000
--- a/extensions/amp-story/1.0/amp-story-affiliate-link.js
+++ /dev/null
@@ -1,164 +0,0 @@
-import * as Preact from '#core/dom/jsx';
-/**
- * @fileoverview Affiliate link component that expands when clicked.
- */
-
-import {Services} from '#service';
-import {StateProperty, getStoreService} from './amp-story-store-service';
-import {StoryAnalyticsEvent, getAnalyticsService} from './story-analytics';
-import {getAmpdoc} from '../../../src/service-helpers';
-
-/**
- * Links that are affiliate links.
- * @const {string}
- */
-export const AFFILIATE_LINK_SELECTOR = 'a[affiliate-link-icon]';
-
-/**
- * Custom property signifying a built link.
- * @const {string}
- */
-export const AFFILIATE_LINK_BUILT = '__AMP_AFFILIATE_LINK_BUILT';
-
-export class AmpStoryAffiliateLink {
-  /**
-   * @param {!Window} win
-   * @param {!Element} element
-   */
-  constructor(win, element) {
-    /** @private {!Window} */
-    this.win_ = win;
-
-    /** @private {!Element} */
-    this.element_ = element;
-
-    /** @private {?Element} */
-    this.textEl_ = null;
-
-    /** @private {?Element} */
-    this.launchEl_ = null;
-
-    /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
-    this.storeService_ = getStoreService(this.win_);
-
-    /** @private {string} */
-    this.text_ = this.element_.textContent;
-
-    /** @private @const {!../../../src/service/mutator-interface.MutatorInterface} */
-    this.mutator_ = Services.mutatorForDoc(getAmpdoc(this.win_.document));
-
-    /** @private @const {!./story-analytics.StoryAnalyticsService} */
-    this.analyticsService_ = getAnalyticsService(this.win_, element);
-  }
-
-  /**
-   * Builds affiliate link.
-   */
-  build() {
-    if (this.element_[AFFILIATE_LINK_BUILT]) {
-      return;
-    }
-
-    this.mutator_.mutateElement(this.element_, () => {
-      this.element_.textContent = '';
-      this.element_.setAttribute('pristine', '');
-      this.addPulseElement_();
-      this.addIconElement_();
-      this.addText_();
-      this.addLaunchElement_();
-    });
-
-    this.initializeListeners_();
-    this.element_[AFFILIATE_LINK_BUILT] = true;
-  }
-
-  /**
-   * Initializes listeners.
-   * @private
-   */
-  initializeListeners_() {
-    this.storeService_.subscribe(
-      StateProperty.AFFILIATE_LINK_STATE,
-      (elementToToggleExpand) => {
-        const expand = this.element_ === elementToToggleExpand;
-        if (expand) {
-          this.element_.setAttribute('expanded', '');
-          this.textEl_.removeAttribute('hidden');
-          this.launchEl_.removeAttribute('hidden');
-        } else {
-          this.element_.removeAttribute('expanded');
-          this.textEl_.setAttribute('hidden', '');
-          this.launchEl_.setAttribute('hidden', '');
-        }
-        if (expand) {
-          this.element_.removeAttribute('pristine');
-          this.analyticsService_.triggerEvent(
-            StoryAnalyticsEvent.FOCUS,
-            this.element_
-          );
-        }
-      }
-    );
-
-    this.element_.addEventListener('click', (event) => {
-      if (this.element_.hasAttribute('expanded')) {
-        event.stopPropagation();
-        this.analyticsService_.triggerEvent(
-          StoryAnalyticsEvent.CLICK_THROUGH,
-          this.element_
-        );
-      }
-    });
-  }
-
-  /**
-   * Adds icon as a child element of <amp-story-affiliate-link>.
-   * @private
-   */
-  addIconElement_() {
-    const iconEl = (
-      <div class="i-amphtml-story-affiliate-link-circle">
-        <i class="i-amphtml-story-affiliate-link-icon"></i>
-        <div class="i-amphtml-story-reset i-amphtml-hidden">
-          <span class="i-amphtml-story-affiliate-link-text" hidden></span>
-          <i class="i-amphtml-story-affiliate-link-launch" hidden></i>
-        </div>
-      </div>
-    );
-    this.element_.appendChild(iconEl);
-  }
-
-  /**
-   * Adds text from <a> tag to expanded link.
-   * @private
-   */
-  addText_() {
-    this.textEl_ = this.element_.querySelector(
-      '.i-amphtml-story-affiliate-link-text'
-    );
-
-    this.textEl_.textContent = this.text_;
-    this.textEl_.setAttribute('hidden', '');
-  }
-
-  /**
-   * Adds launch arrow to expanded link.
-   * @private
-   */
-  addLaunchElement_() {
-    this.launchEl_ = this.element_.querySelector(
-      '.i-amphtml-story-affiliate-link-launch'
-    );
-
-    this.launchEl_.setAttribute('hidden', '');
-  }
-
-  /**
-   * Adds pulse as a child element of <amp-story-affiliate-link>.
-   * @private
-   */
-  addPulseElement_() {
-    const pulseEl = <div class="i-amphtml-story-affiliate-link-pulse"></div>;
-    this.element_.appendChild(pulseEl);
-  }
-}
diff --git a/extensions/amp-story/1.0/amp-story-embedded-component.js b/extensions/amp-story/1.0/amp-story-embedded-component.js
index c92f835a7b13..c77009a64300 100644
--- a/extensions/amp-story/1.0/amp-story-embedded-component.js
+++ b/extensions/amp-story/1.0/amp-story-embedded-component.js
@@ -62,7 +62,7 @@ const EMBEDDED_COMPONENTS_SELECTORS = {
 const LAUNCHABLE_COMPONENTS = {
   'a': {
     actionIcon: LAUNCH_ICON_CLASS,
-    selector: 'a[href]:not([affiliate-link-icon])',
+    selector: 'a[href]',
   },
   ...EMBEDDED_COMPONENTS_SELECTORS,
 };
diff --git a/extensions/amp-story/1.0/amp-story-page.js b/extensions/amp-story/1.0/amp-story-page.js
index 7788668f38ab..0e3d3c152da8 100644
--- a/extensions/amp-story/1.0/amp-story-page.js
+++ b/extensions/amp-story/1.0/amp-story-page.js
@@ -10,10 +10,6 @@ import * as Preact from '#core/dom/jsx';
  * </code>
  */
 import {isAutoplaySupported, tryPlay} from '#core/dom/video';
-import {
-  AFFILIATE_LINK_SELECTOR,
-  AmpStoryAffiliateLink,
-} from './amp-story-affiliate-link';
 import {
   Action,
   StateProperty,
@@ -655,7 +651,6 @@ export class AmpStoryPage extends AMP.BaseElement {
    */
   findAndPrepareEmbeddedComponents_() {
     this.addClickShieldToEmbeddedComponents_();
-    this.buildAffiliateLinks_();
   }
 
   /**
@@ -679,18 +674,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     });
   }
 
-  /**
-   * Initializes affiliate links.
-   */
-  buildAffiliateLinks_() {
-    toArray(
-      scopedQuerySelectorAll(this.element, AFFILIATE_LINK_SELECTOR)
-    ).forEach((el) => {
-      const link = new AmpStoryAffiliateLink(this.win, el);
-      link.build();
-    });
-  }
-
   /** @private */
   markPageAsLoaded_() {
     dispatch(
diff --git a/extensions/amp-story/1.0/amp-story-store-service.js b/extensions/amp-story/1.0/amp-story-store-service.js
index 758e24aa5d6d..8b08755979e0 100644
--- a/extensions/amp-story/1.0/amp-story-store-service.js
+++ b/extensions/amp-story/1.0/amp-story-store-service.js
@@ -101,7 +101,6 @@ export let ShoppingDataDef;
  *    accessState: boolean,
  *    adState: boolean,
  *    pageAttachmentState: boolean,
- *    affiliateLinkState: !Element,
  *    desktopState: boolean,
  *    educationState: boolean,
  *    gyroscopeEnabledState: string,
@@ -150,7 +149,6 @@ export const StateProperty = {
   ACCESS_STATE: 'accessState', // amp-access paywall.
   AD_STATE: 'adState',
   PAGE_ATTACHMENT_STATE: 'pageAttachmentState',
-  AFFILIATE_LINK_STATE: 'affiliateLinkState',
   EDUCATION_STATE: 'educationState',
   GYROSCOPE_PERMISSION_STATE: 'gyroscopePermissionState',
   INFO_DIALOG_STATE: 'infoDialogState',
@@ -198,7 +196,6 @@ export const Action = {
   SET_PAGE_IDS: 'setPageIds',
   TOGGLE_ACCESS: 'toggleAccess',
   TOGGLE_AD: 'toggleAd',
-  TOGGLE_AFFILIATE_LINK: 'toggleAffiliateLink',
   TOGGLE_EDUCATION: 'toggleEducation',
   TOGGLE_INFO_DIALOG: 'toggleInfoDialog',
   TOGGLE_INTERACTIVE_COMPONENT: 'toggleInteractiveComponent',
@@ -321,12 +318,6 @@ const actions = (state, action, data) => {
         ...state,
         [StateProperty.AD_STATE]: !!data,
       });
-    // Expands or collapses the affiliate link.
-    case Action.TOGGLE_AFFILIATE_LINK:
-      return /** @type {!State} */ ({
-        ...state,
-        [StateProperty.AFFILIATE_LINK_STATE]: data,
-      });
     case Action.TOGGLE_EDUCATION:
       return /** @type {!State} */ ({
         ...state,
@@ -554,7 +545,6 @@ export class AmpStoryStoreService {
       [StateProperty.VIEWER_CUSTOM_CONTROLS]: [],
       [StateProperty.ACCESS_STATE]: false,
       [StateProperty.AD_STATE]: false,
-      [StateProperty.AFFILIATE_LINK_STATE]: null,
       [StateProperty.EDUCATION_STATE]: false,
       [StateProperty.GYROSCOPE_PERMISSION_STATE]: '',
       [StateProperty.INFO_DIALOG_STATE]: false,
diff --git a/extensions/amp-story/1.0/amp-story.css b/extensions/amp-story/1.0/amp-story.css
index 0f157bbc4632..15fd825852eb 100644
--- a/extensions/amp-story/1.0/amp-story.css
+++ b/extensions/amp-story/1.0/amp-story.css
@@ -1,5 +1,4 @@
 @import './amp-story-access.css';
-@import './amp-story-affiliate-link.css';
 @import './amp-story-desktop-one-panel.css';
 @import './amp-story-templates.css';
 @import './amp-story-user-overridable.css';
diff --git a/extensions/amp-story/1.0/page-advancement.js b/extensions/amp-story/1.0/page-advancement.js
index 3895a8509fe9..b0d31dec9317 100644
--- a/extensions/amp-story/1.0/page-advancement.js
+++ b/extensions/amp-story/1.0/page-advancement.js
@@ -1,4 +1,3 @@
-import {AFFILIATE_LINK_SELECTOR} from './amp-story-affiliate-link';
 import {
   Action,
   EmbeddedComponentState,
@@ -637,27 +636,6 @@ export class ManualAdvancement extends AdvancementConfig {
     );
   }
 
-  /**
-   * Check if click should be handled by the affiliate link logic.
-   * @param {!Element} target
-   * @private
-   * @return {boolean}
-   */
-  isHandledByAffiliateLink_(target) {
-    const clickedOnLink = matches(target, AFFILIATE_LINK_SELECTOR);
-
-    // do not handle if clicking on expanded affiliate link
-    if (clickedOnLink && target.hasAttribute('expanded')) {
-      return false;
-    }
-
-    const expandedElement = this.storeService_.get(
-      StateProperty.AFFILIATE_LINK_STATE
-    );
-
-    return expandedElement != null || clickedOnLink;
-  }
-
   /**
    * Performs a system navigation if it is determined that the specified event
    * was a click intended for navigation.
@@ -684,18 +662,6 @@ export class ManualAdvancement extends AdvancementConfig {
       return;
     }
 
-    if (this.isHandledByAffiliateLink_(target)) {
-      event.preventDefault();
-      event.stopPropagation();
-      const clickedOnLink = matches(target, AFFILIATE_LINK_SELECTOR);
-      if (clickedOnLink) {
-        this.storeService_.dispatch(Action.TOGGLE_AFFILIATE_LINK, target);
-      } else {
-        this.storeService_.dispatch(Action.TOGGLE_AFFILIATE_LINK, null);
-      }
-      return;
-    }
-
     if (
       !this.isRunning() ||
       !this.isNavigationalClick_(event) ||
diff --git a/extensions/amp-story/1.0/test/integration/test-amp-story-affiliate-link.js b/extensions/amp-story/1.0/test/integration/test-amp-story-affiliate-link.js
deleted file mode 100644
index 52d43a9f3e8e..000000000000
--- a/extensions/amp-story/1.0/test/integration/test-amp-story-affiliate-link.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import {BrowserController, RequestBank} from '#testing/helpers/service';
-
-const t = describes.sandboxed.configure().skipSafari().skipEdge();
-
-t.run('amp-story-affiliate link', {}, () => {
-  describes.integration(
-    'analytics on click',
-    {
-      body: `
-      <amp-story standalone>
-        <amp-story-page id="page-1">
-          <amp-story-grid-layer template="vertical">
-            <h1>Third Page</h1>
-            <a id="blink-1" href="https://amp.dev" role="link" target="_blank" affiliate-link-icon="shopping-cart">
-              amp.devamp.devamp.devamp.devamp.devamp.dev
-            </a>
-          </amp-story-grid-layer>
-        </amp-story-page>
-      </amp-story>
-      <amp-analytics>
-        <script type="application/json">
-        {
-          "requests": {
-            "endpoint": "${RequestBank.getUrl()}"
-          },
-          "triggers": {
-            "trackLinkClicks": {
-              "on": "click",
-              "selector": "[affiliate-link-icon]",
-              "request": "endpoint"
-            }
-          }
-        }
-        </script>
-      </amp-analytics>`,
-      extensions: ['amp-story', 'amp-analytics'],
-    },
-    (env) => {
-      let browser;
-
-      beforeEach(function () {
-        browser = new BrowserController(env.win);
-        return browser.waitForElementLayout('amp-analytics');
-      });
-
-      afterEach(() => {
-        return RequestBank.tearDown();
-      });
-
-      it.skip('should not send any analytics event on expand', async () => {
-        browser.click('#blink-1');
-        browser.click('h1');
-        await expect(RequestBank.withdraw()).to.be.rejected;
-      });
-
-      it.skip('should not send any analytics event on collapse', async () => {
-        browser.click('#blink-1');
-        browser.click('h1');
-        await expect(RequestBank.withdraw()).to.be.rejected;
-      });
-
-      it.skip('should send analytics event on external click', async () => {
-        browser.click('#blink-1');
-        browser.click('#blink-1');
-        const req = await RequestBank.withdraw();
-        expect(req.url).to.equal('/');
-      });
-    }
-  );
-});