diff --git a/gr-editor/gr-editor.html b/gr-editor/gr-editor.html
index f9c8869..fd8673e 100644
--- a/gr-editor/gr-editor.html
+++ b/gr-editor/gr-editor.html
@@ -14,8 +14,6 @@
 limitations under the License.
 -->
 
-<link rel="import" href="../bower_components/polymer/polymer.html">
-
 <link rel="import" href="gr-editor-styles.html">
 
 <script src="../bower_components/codemirror-minified/lib/codemirror.js"></script>
diff --git a/gr-editor/gr-editor_test.html b/gr-editor/gr-editor_test.html
index aa9a36e..2d68df6 100644
--- a/gr-editor/gr-editor_test.html
+++ b/gr-editor/gr-editor_test.html
@@ -19,6 +19,12 @@
 <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
 <title>gr-editor</title>
 
+<!--
+Import polymer here, as the editor itself receives Polymer during Gerrit
+release build step.
+-->
+<link rel="import" href="../bower_components/polymer/polymer.html">
+
 <link rel="import" href="../bower_components/iron-test-helpers/iron-test-helpers.html">
 <link rel="import" href="gr-editor.html">
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>