Auto merge of #2211 - jtgeibel:revert-2201, r=jtgeibel

Revert #2201 to fix broken new token button

I've bisected the issue with the broken "New Token" button to this merge.  What is very strange is that the original commit 28a03bf that implemented the change does not appear to have this issue.  Therefore it seems the issue is some sort of conflict between multiple pull requests somewhere in c970817...663259c.

I'm deploying to staging now and will deploy to production as soon as I test the change there.

cc @locks
r? @ghost

Author: bors

package-lock.json

@@ -73,7 +73,7 @@
     "ember-resolver": "^7.0.0",
     "ember-router-scroll": "^2.0.0",
     "ember-template-lint": "^1.13.2",
-    "ember-source": "~3.16.2",
+    "ember-source": "~3.16.1",
     "ember-svg-jar": "^2.2.3",
     "ember-test-selectors": "^3.0.0",
     "ember-web-app": "^4.0.0",