diff --git a/client/gutenberg/extensions/tiled-gallery/layouts.js b/client/gutenberg/extensions/tiled-gallery/layouts.js
index 11b36d8db1e58..0310a935f44d5 100644
--- a/client/gutenberg/extensions/tiled-gallery/layouts.js
+++ b/client/gutenberg/extensions/tiled-gallery/layouts.js
@@ -4,11 +4,6 @@
  * External dependencies
  */
 import find from 'lodash/find';
-// @TODO:
-// Adding `@wordpress/token-list` to dependencies in wp-calypso conflicts with
-// current 3.0.0 version of `@wordpress/editor`.
-// This will still work for Jetpack, but will fail when importing the block in Calypso
-// eslint-disable-next-line import/no-extraneous-dependencies
 import TokenList from '@wordpress/token-list';
 
 /**
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 8c6d51076eeca..041c3d6dc7306 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -9491,7 +9491,7 @@
         },
         "pify": {
           "version": "2.3.0",
-          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         }
       }
diff --git a/package.json b/package.json
index d029f895b6643..626e144600cf2 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "@wordpress/nux": "2.0.2",
     "@wordpress/plugins": "2.0.2",
     "@wordpress/rich-text": "1.0.0-beta.1",
+    "@wordpress/token-list": "1.0.2",
     "@wordpress/url": "2.0.2",
     "@wordpress/viewport": "2.0.2",
     "autoprefixer": "9.2.1",